Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: src/scripts/install_packages.sh

Issue 523159: Changes to make the resulting image mostly functional when skipping debootstrap. (Closed)
Patch Set: Added comment. Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/package_repo/package-list-prod.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/install_packages.sh
diff --git a/src/scripts/install_packages.sh b/src/scripts/install_packages.sh
index 1346510075d31bffb2b4604a379bc20fa78a4055..d98f7be09910fb7eeaf55926c3fd10b92f798369 100755
--- a/src/scripts/install_packages.sh
+++ b/src/scripts/install_packages.sh
@@ -174,7 +174,8 @@ else
# base-passwd/passwd - So that chmod and useradd/groupadd will work
# bash - So that scripts can run
# libpam-runtim/libuuid1 - Not exactly sure why
- EXTRA_PACKAGES="base-files base-passwd bash libpam-runtime libuuid1 login passwd"
+ # sysv-rc - So that we can overwrite invoke-rc.d, update-rc.d
+ EXTRA_PACKAGES="base-files base-passwd bash libpam-runtime libuuid1 login passwd sysv-rc"
# Prep the rootfs to work with dpgk and apt
sudo mkdir -p "${ROOT_FS_DIR}/var/lib/dpkg/info"
@@ -215,6 +216,16 @@ else
# TODO: Remove when we stop having maintainer scripts altogether.
sudo cp -a /dev/* "${ROOT_FS_DIR}/dev"
+ sudo cp -a /etc/resolv.conf "${ROOT_FS_DIR}/etc/resolv.conf"
+ sudo ln -sf /bin/true "${ROOT_FS_DIR}/usr/sbin/invoke-rc.d"
+ sudo ln -sf /bin/true "${ROOT_FS_DIR}/usr/sbin/update-rc.d"
+
+ # base-files
+ # TODO: Careful audit of the postinst; this isn't all that is there.
+ sudo cp -a "${ROOT_FS_DIR}/usr/share/base-files/networks" \
+ "${ROOT_FS_DIR}/usr/share/base-files/nsswitch.conf" \
+ "${ROOT_FS_DIR}/usr/share/base-files/profile" \
+ "${ROOT_FS_DIR}/etc/"
# base-passwd
sudo cp "${ROOT_FS_DIR}/usr/share/base-passwd/passwd.master" \
« no previous file with comments | « src/package_repo/package-list-prod.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698