diff options
| author | Michal Suchanek <hramrach@gmail.com> | 2012-10-05 15:32:05 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-12 16:43:54 +0100 |
| commit | bb0bb603ed3011e83727f89d89c27be4d2309a5a (patch) | |
| tree | 6296ea40b4c27ebee256ae6db8944629831e46d1 /scripts/boot | |
| parent | 28ad683d417e97fb94cbc0626c0d6999026fb872 (diff) | |
| download | live-boot-bb0bb603ed3011e83727f89d89c27be4d2309a5a.tar.gz live-boot-bb0bb603ed3011e83727f89d89c27be4d2309a5a.zip | |
Including util-linux mount in initramfs.
Diffstat (limited to 'scripts/boot')
| -rwxr-xr-x | scripts/boot/9990-cmdline-old | 5 | ||||
| -rwxr-xr-x | scripts/boot/9990-main.sh | 6 | ||||
| -rwxr-xr-x | scripts/boot/9990-overlay.sh | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old index 85f1b62..94c5163 100755 --- a/scripts/boot/9990-cmdline-old +++ b/scripts/boot/9990-cmdline-old @@ -30,6 +30,11 @@ Cmdline_old () export DHCP ;; + klibc-mount=*) + KLIBC_MOUNT="${_PARAMETER#klibc-mount=}" + export KLIBC_MOUNT + ;; + ethdevice=*) DEVICE="${_PARAMETER#ethdevice=}" ETHDEVICE="${DEVICE}" diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index 983a1cb..0924581 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -32,6 +32,12 @@ Main () . /conf/param.conf fi + if [ -x /bin/mount.util-linux ] && [ -z "${KLIBC_MOUNT}" ] + then + # fuse does not work with klibc mount + ln -f /bin/mount.util-linux /bin/mount + fi + # Needed here too because some things (*cough* udev *cough*) # changes the timeout diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index 80b5726..dba042b 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -335,7 +335,8 @@ setup_unionfs () then # FIXME: handle PERSISTENCE_READONLY unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}" - mount_full $unionmountopts "${unionmountpoint}" + # unionmount only works with util-linux mount + mount.util-linux $unionmountopts "${unionmountpoint}" else cow_dir="/live/overlay${dir}" rootfs_dir="${rootfs}${dir}" |