sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "elements: zypper-minimal: Mount common pseudo filesystems"

Browse Source
This commit is contained in:
Jenkins 2016-11-14 07:08:23 +00:00 committed by Gerrit Code Review
commit 3bfff8f905
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
elements/zypper-minimal/root.d/08-zypper-chroot
View File

@ -27,6 +27,10 @@ set -o pipefail
[ -n "${ZYPPER_REPOS}" ] [ -n "${ZYPPER_REPOS}" ]
function cleanup() { function cleanup() {
sudo umount $TARGET_ROOT/proc
sudo umount $TARGET_ROOT/dev/pts
sudo umount $TARGET_ROOT/dev
sudo umount $TARGET_ROOT/sys
sudo umount $TMP_MOUNT_PATH/var/cache/zypp sudo umount $TMP_MOUNT_PATH/var/cache/zypp
} }
@ -54,6 +58,16 @@ sudo mount --bind $ZYPPER_CACHE_DIR $TMP_MOUNT_PATH/var/cache/zypp
# since last run. # since last run.
sudo zypper ${ZYPPER_TARGET_OPTS} refresh sudo zypper ${ZYPPER_TARGET_OPTS} refresh
# Note this is not usually done for root.d elements (see
# lib/common-functions:mount_proc_dev_sys) but it's important that
# we have things like /dev/urandom around inside the chroot for
# the rpm [pre|post]inst scripts within the packages.
sudo mkdir -p $TARGET_ROOT/proc $TARGET_ROOT/dev $TARGET_ROOT/sys
sudo mount -t proc none $TARGET_ROOT/proc
sudo mount --bind /dev $TARGET_ROOT/dev
sudo mount --bind /dev/pts $TARGET_ROOT/dev/pts
sudo mount -t sysfs none $TARGET_ROOT/sys
# Install filesystem, base and useful tools # Install filesystem, base and useful tools
sudo zypper ${ZYPPER_TARGET_OPTS} install ${ZYPPER_INSTALL_OPTS} filesystem sudo zypper ${ZYPPER_TARGET_OPTS} install ${ZYPPER_INSTALL_OPTS} filesystem
# Install basic components in order # Install basic components in order
@ -84,5 +98,5 @@ for newfile in $(sudo find $TARGET_ROOT -type f -name '*rpmnew') ; do
sudo mv $newfile $(echo $newfile | sed 's/.rpmnew$//') sudo mv $newfile $(echo $newfile | sed 's/.rpmnew$//')
done done
# Unmounting of the /var/cache/zypp is handled by the cleanup EXIT # Unmounting of all the mount points is handled by the cleanup EXIT
# handler so there is nothing else to do here # handler so there is nothing else to do here