[arch-releng] [PATCH 1/4] [configs/*] Remove custom fstab, not needed anymore.
Without fstab system start and shutdown without any issues (thanks to recent changes in initscripts). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/baseline/build.sh | 9 --------- configs/baseline/root-image/etc/fstab | 2 -- configs/releng/root-image/etc/fstab | 5 ----- 3 files changed, 0 insertions(+), 16 deletions(-) delete mode 100644 configs/baseline/root-image/etc/fstab delete mode 100644 configs/releng/root-image/etc/fstab diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 0dbed2a..11d4145 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -16,14 +16,6 @@ make_basefs() { mkarchiso ${verbose} -D "${install_dir}" -p "syslinux" create "${work_dir}" } -# Customize installation (root-image) -make_customize_root_image() { - if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then - cp -af root-image ${work_dir} - : > ${work_dir}/build.${FUNCNAME} - fi -} - # Copy mkinitcpio archiso hooks (root-image) make_setup_mkinitcpio() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then @@ -94,7 +86,6 @@ else fi make_basefs -make_customize_root_image make_setup_mkinitcpio make_boot make_syslinux diff --git a/configs/baseline/root-image/etc/fstab b/configs/baseline/root-image/etc/fstab deleted file mode 100644 index 4b82b80..0000000 --- a/configs/baseline/root-image/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# <file system> <dir> <type> <options> <dump> <pass> -/dev/mapper/root-image / auto defaults 0 0 diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab deleted file mode 100644 index 0df0cba..0000000 --- a/configs/releng/root-image/etc/fstab +++ /dev/null @@ -1,5 +0,0 @@ -# -# /etc/fstab: static file system information -# -# <file system> <dir> <type> <options> <dump> <pass> -/dev/mapper/root-image / auto defaults 0 0 -- 1.7.6
On 08/13/2011 11:12 PM, Gerardo Exequiel Pozzi wrote:
Without fstab system start and shutdown without any issues (thanks to recent changes in initscripts).
Signed-off-by: Gerardo Exequiel Pozzi<vmlinuz386@yahoo.com.ar> --- configs/baseline/build.sh | 9 --------- configs/baseline/root-image/etc/fstab | 2 -- configs/releng/root-image/etc/fstab | 5 ----- 3 files changed, 0 insertions(+), 16 deletions(-) delete mode 100644 configs/baseline/root-image/etc/fstab delete mode 100644 configs/releng/root-image/etc/fstab
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 0dbed2a..11d4145 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -16,14 +16,6 @@ make_basefs() { mkarchiso ${verbose} -D "${install_dir}" -p "syslinux" create "${work_dir}" }
-# Customize installation (root-image) -make_customize_root_image() { - if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then - cp -af root-image ${work_dir} - :> ${work_dir}/build.${FUNCNAME} - fi -} - # Copy mkinitcpio archiso hooks (root-image) make_setup_mkinitcpio() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then @@ -94,7 +86,6 @@ else fi
make_basefs -make_customize_root_image make_setup_mkinitcpio make_boot make_syslinux diff --git a/configs/baseline/root-image/etc/fstab b/configs/baseline/root-image/etc/fstab deleted file mode 100644 index 4b82b80..0000000 --- a/configs/baseline/root-image/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -#<file system> <dir> <type> <options> <dump> <pass> -/dev/mapper/root-image / auto defaults 0 0 diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab deleted file mode 100644 index 0df0cba..0000000 --- a/configs/releng/root-image/etc/fstab +++ /dev/null @@ -1,5 +0,0 @@ -# -# /etc/fstab: static file system information -# -#<file system> <dir> <type> <options> <dump> <pass> -/dev/mapper/root-image / auto defaults 0 0
Whoops, missed [RFC], this patch is part of series that will merge in 24 hours. -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
Am 14.08.2011 04:21, schrieb Gerardo Exequiel Pozzi:
On 08/13/2011 11:12 PM, Gerardo Exequiel Pozzi wrote:
Without fstab system start and shutdown without any issues (thanks to recent changes in initscripts).
I seem to have missed that, can you point me to the relevant commit(s)?
On 08/14/2011 05:02 AM, Thomas Bächler wrote:
Am 14.08.2011 04:21, schrieb Gerardo Exequiel Pozzi:
On 08/13/2011 11:12 PM, Gerardo Exequiel Pozzi wrote:
Without fstab system start and shutdown without any issues (thanks to recent changes in initscripts). I seem to have missed that, can you point me to the relevant commit(s)?
I guessed bad about initscripts! The thing is that I remove mtab from root-image in cleanup step[#1], and mount does not fail in this case with "can't find / in /etc/fstab or /etc/mtab"), just remount OK. Also this help to avoid confusion about recent added configurable prefix "arch_", /dev/mapper/root-image (in fstab) vs /dev/mapper/arch_root-image (real), not a big issue. [#1] http://projects.archlinux.org/archiso.git/commit/?id=93763a2d8225a92ef99e734... PS: editing commit msg... -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (2)
-
Gerardo Exequiel Pozzi
-
Thomas Bächler