From bb63b2a3e6ddd144674e6b40b702798a1c950fdd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 27 Sep 2012 12:35:01 +0200 Subject: [PATCH] Moving remaining stuff from /live to /lib/live to avoid further namespace pollution. --- backends/initramfs-tools/live.hook | 2 +- manpages/de/live-boot.de.7 | 4 ++-- manpages/en/live-boot.7 | 2 +- manpages/es/live-boot.es.7 | 6 +++--- manpages/po/de/live-boot.7.po | 4 ++-- manpages/po/es/live-boot.7.po | 6 +++--- manpages/pot/live-boot.7.pot | 4 ++-- scripts/boot.sh | 3 +-- scripts/boot/9990-main.sh | 16 ++++++++-------- scripts/boot/9990-overlay.sh | 24 ++++++++++++------------ 10 files changed, 35 insertions(+), 36 deletions(-) diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index 89420b6..382e161 100755 --- a/backends/initramfs-tools/live.hook +++ b/backends/initramfs-tools/live.hook @@ -8,7 +8,7 @@ set -e # Reading configuration file from filesystem and live-media for _FILE in /etc/live/boot.conf /etc/live/boot/* \ - /live/image/live/boot.conf /live/image/live/boot/* + /lib/live/image/live/boot.conf /lib/live/image/live/boot/* do if [ -e "${_FILE}" ] then diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 0c77340..2078b06 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -221,8 +221,8 @@ This option causes live\-boot to reboot without attempting to eject the media and without asking the user to remove the boot media. .IP \fBshowmounts\fP 4 This parameter will make live\-boot to show on "/" the ro filesystems (mostly -compressed) on "/live". This is not enabled by default because could lead to -problems by applications like "mono" which store binary paths on +compressed) on "/lib/live". This is not enabled by default because could +lead to problems by applications like "mono" which store binary paths on installation. .IP \fBsilent\fP 4 If you boot with the normal quiet parameter, live\-boot hides most messages diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 8871abb..ba5b114 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -127,7 +127,7 @@ Add a suffix when searching for the image filenames or partition labels to use f .IP "\fBquickreboot\fR" 4 This option causes live\-boot to reboot without attempting to eject the media and without asking the user to remove the boot media. .IP "\fBshowmounts\fR" 4 -This parameter will make live\-boot to show on "/" the ro filesystems (mostly compressed) on "/live". This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation. +This parameter will make live\-boot to show on "/" the ro filesystems (mostly compressed) on "/lib/live". This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation. .IP "\fBsilent\fR" 4 If you boot with the normal quiet parameter, live\-boot hides most messages of its own. When adding silent, it hides all. .IP "\fBtodisk\fR=\fIDEVICE\fR" 4 diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index b35d1a5..6f756fb 100644 --- a/manpages/es/live-boot.es.7 +++ b/manpages/es/live-boot.es.7 @@ -237,9 +237,9 @@ Esta opción hace que live\-boot reinicie sin tratar de expulsar los medios y sin pedirle al usuario que extraiga el dispositivo usado para arrancar. .IP \fBshowmounts\fP 4 Este parámetro hará que live\-boot muestre en "/" los sistemas de ficheros ro -(en su mayoría comprimidos) en "/live". Esto no está activado por defecto, -porque podría dar lugar a problemas con aplicaciones como "mono" que -almacenan rutas binarias durante su instalación. +(en su mayoría comprimidos) en "/lib/live". Esto no está activado por +defecto, porque podría dar lugar a problemas con aplicaciones como "mono" +que almacenan rutas binarias durante su instalación. .IP \fBsilent\fP 4 Si arranca con el parámetro normal quiet, live\-boot esconde la mayoría de sus propios mensajes. Cuando se utiliza silent, los esconde todos. diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index 837a24b..65c2ee7 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 3.0~b3-1\n" -"POT-Creation-Date: 2012-09-27 10:58+0300\n" +"POT-Creation-Date: 2012-09-27 12:32+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -704,7 +704,7 @@ msgstr "" #: en/live-boot.7:131 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " -"(mostly compressed) on \"/live\". This is not enabled by default because " +"(mostly compressed) on \"/lib/live\". This is not enabled by default because " "could lead to problems by applications like \"mono\" which store binary " "paths on installation." msgstr "" diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index a9a6931..a9f67f6 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 3.0~b3-1\n" -"POT-Creation-Date: 2012-09-27 11:01+0300\n" +"POT-Creation-Date: 2012-09-27 12:32+0300\n" "PO-Revision-Date: 2012-06-07 20:29+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" "Language-Team: none\n" @@ -863,12 +863,12 @@ msgstr "B" #: en/live-boot.7:131 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " -"(mostly compressed) on \"/live\". This is not enabled by default because " +"(mostly compressed) on \"/lib/live\". This is not enabled by default because " "could lead to problems by applications like \"mono\" which store binary " "paths on installation." msgstr "" "Este parámetro hará que live-boot muestre en \"/\" los sistemas de ficheros " -"ro (en su mayoría comprimidos) en \"/live\". Esto no está activado por " +"ro (en su mayoría comprimidos) en \"/lib/live\". Esto no está activado por " "defecto, porque podría dar lugar a problemas con aplicaciones como \"mono\" " "que almacenan rutas binarias durante su instalación." diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 7fb5d4e..a089154 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2012-09-27 11:01+0300\n" +"POT-Creation-Date: 2012-09-27 12:32+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -705,7 +705,7 @@ msgstr "" #: en/live-boot.7:131 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " -"(mostly compressed) on \"/live\". This is not enabled by default because " +"(mostly compressed) on \"/lib/live\". This is not enabled by default because " "could lead to problems by applications like \"mono\" which store binary " "paths on installation." msgstr "" diff --git a/scripts/boot.sh b/scripts/boot.sh index 11e8094..67585f9 100755 --- a/scripts/boot.sh +++ b/scripts/boot.sh @@ -3,8 +3,7 @@ # set -e # Reading configuration file from filesystem and live-media -for _FILE in /etc/live/boot.conf /etc/live/boot/* \ - /live/image/live/boot.conf /live/image/live/boot/* +for _FILE in /etc/live/boot.conf /etc/live/boot/* do if [ -e "${_FILE}" ] then diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index ba77dd4..ef41fb0 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -132,7 +132,7 @@ Main () if [ -n "${ROOT_PID}" ] then - echo "${ROOT_PID}" > "${rootmnt}"/live/root.pid + echo "${ROOT_PID}" > "${rootmnt}"/lib/live/root.pid fi log_end_msg @@ -146,8 +146,8 @@ Main () esac # Move to the new root filesystem so that programs there can get at it. - mkdir -p /root/live/image - mount --move /live/image /root/live/image + mkdir -p /root/lib/live/image + mount --move /live/image /root/lib/live/image # aufs2 in kernel versions around 2.6.33 has a regression: # directories can't be accessed when read for the first the time, @@ -158,8 +158,8 @@ Main () # Move findiso directory to the new root filesystem so that programs there can get at it. if [ -d /live/findiso ] then - mkdir -p /root/live/findiso - mount -n --move /live/findiso /root/live/findiso + mkdir -p /root/lib/live/findiso + mount -n --move /live/findiso /root/lib/live/findiso fi # if we do not unmount the ISO we can't run "fsck /dev/ice" later on @@ -169,10 +169,10 @@ Main () then losetup -d /dev/loop0 - if is_mountpoint /root/live/findiso + if is_mountpoint /root/lib/live/findiso then - umount /root/live/findiso - rmdir --ignore-fail-on-non-empty /root/live/findiso \ + umount /root/lib/live/findiso + rmdir --ignore-fail-on-non-empty /root/lib/live/findiso \ >/dev/null 2>&1 || true fi fi 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" } -- 2.1.4