diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-09-27 12:35:01 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-09-27 12:35:01 +0200 |
| commit | bb63b2a3e6ddd144674e6b40b702798a1c950fdd (patch) | |
| tree | 909d4f0d2eba1be17f9589b058372f989bca470c /scripts/boot/9990-overlay.sh | |
| parent | 89adeb3c4d91d12062e6fca8a00978eea52fe67f (diff) | |
| download | live-boot-bb63b2a3e6ddd144674e6b40b702798a1c950fdd.tar.gz live-boot-bb63b2a3e6ddd144674e6b40b702798a1c950fdd.zip | |
Moving remaining stuff from /live to /lib/live to avoid further namespace pollution.
Diffstat (limited to 'scripts/boot/9990-overlay.sh')
| -rwxr-xr-x | scripts/boot/9990-overlay.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index d377d34..8283c73 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -405,30 +405,30 @@ setup_unionfs () done fi - # make /root/live writable for moving filesystems - mkdir -p "${rootmnt}/live" - mount -t tmpfs tmpfs "${rootmnt}/live" + # make /root/lib/live writable for moving filesystems + mkdir -p "${rootmnt}/lib/live" + mount -t tmpfs tmpfs "${rootmnt}/lib/live" # move all mountpoints to root filesystem for _DIRECTORY in rofs persistence do if [ -d "/live/${_DIRECTORY}" ] then - mkdir -p "${rootmnt}/live/${_DIRECTORY}" + mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}" for _MOUNT in $(ls /live/${_DIRECTORY}) do - mkdir -p "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" - mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \ - mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" || \ - log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" + mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" + mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \ + mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" || \ + log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" done fi done - mkdir -p "${rootmnt}/live/overlay" - mount -o move /live/overlay "${rootmnt}/live/overlay" > /dev/null 2>&1 || \ - mount -o bind /overlay "${rootmnt}/live/overlay" || \ - log_warning_msg "W: failed to mount /overlay to ${rootmnt}/live/overlay" + mkdir -p "${rootmnt}/lib/live/overlay" + mount -o move /live/overlay "${rootmnt}/lib/live/overlay" > /dev/null 2>&1 || \ + mount -o bind /live/overlay "${rootmnt}/lib/live/overlay" || \ + log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/overlay" } |