[arch-releng] [PATCH 1/5] [archiso] Remove old code (now redundant)
/etc/mtab symlink is part of [filesystem] since long time Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/mkarchiso | 4 ---- 1 file changed, 4 deletions(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index e3a3346..b9f12c1 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -265,10 +265,6 @@ _cleanup () { fi # Delete package pacman related files. find "${work_dir}" -name "*.pacnew" -name "*.pacsave" -name "*.pacorig" -delete - # Create etc/mtab if not is a symlink. - if [[ ! -L "${work_dir}/root-image/etc/mtab" ]]; then - ln -sf "/proc/self/mounts" "${work_dir}/root-image/etc/mtab" - fi _msg_info "Done!" } -- 1.7.12.3
This was recently enabled in [systemd] package. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/mkarchiso | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index b9f12c1..95bb67f 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -255,6 +255,10 @@ _cleanup () { if [[ -d "${work_dir}/root-image/var/log" ]]; then find "${work_dir}/root-image/var/log" -type f -delete fi + # Avoid journald use permanent storage (Storage=auto) + if [[ -d "${work_dir}/root-image/var/log/journal" ]]; then + rm -rf "${work_dir}/root-image/var/log/journal" + fi # Delete all temporary files and dirs if [[ -d "${work_dir}/root-image/var/tmp" ]]; then find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete -- 1.7.12.3
Am 23.10.2012 17:03, schrieb Gerardo Exequiel Pozzi:
This was recently enabled in [systemd] package.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/mkarchiso | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index b9f12c1..95bb67f 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -255,6 +255,10 @@ _cleanup () { if [[ -d "${work_dir}/root-image/var/log" ]]; then find "${work_dir}/root-image/var/log" -type f -delete fi + # Avoid journald use permanent storage (Storage=auto) + if [[ -d "${work_dir}/root-image/var/log/journal" ]]; then + rm -rf "${work_dir}/root-image/var/log/journal" + fi # Delete all temporary files and dirs if [[ -d "${work_dir}/root-image/var/tmp" ]]; then find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete
This is more about style, but maybe we should explicitly disable it in /etc/systemd/journald.conf (Storage=volatile). -- Pierre Schmitz, https://pierre-schmitz.com
On 10/26/2012 06:36 AM, Pierre Schmitz wrote:
Am 23.10.2012 17:03, schrieb Gerardo Exequiel Pozzi:
This was recently enabled in [systemd] package.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/mkarchiso | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index b9f12c1..95bb67f 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -255,6 +255,10 @@ _cleanup () { if [[ -d "${work_dir}/root-image/var/log" ]]; then find "${work_dir}/root-image/var/log" -type f -delete fi + # Avoid journald use permanent storage (Storage=auto) + if [[ -d "${work_dir}/root-image/var/log/journal" ]]; then + rm -rf "${work_dir}/root-image/var/log/journal" + fi # Delete all temporary files and dirs if [[ -d "${work_dir}/root-image/var/tmp" ]]; then find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete This is more about style, but maybe we should explicitly disable it in /etc/systemd/journald.conf (Storage=volatile).
yes, but I prefer to maintain few custom files as possible. -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
/tmp is mounted as tmpfs since archiso implements own chroot code. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/mkarchiso | 4 ---- 1 file changed, 4 deletions(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 95bb67f..a1ff68d 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -263,10 +263,6 @@ _cleanup () { if [[ -d "${work_dir}/root-image/var/tmp" ]]; then find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete fi - # Delete all temporary files and dirs - if [[ -d "${work_dir}/root-image/tmp" ]]; then - find "${work_dir}/root-image/tmp" -mindepth 1 -delete - fi # Delete package pacman related files. find "${work_dir}" -name "*.pacnew" -name "*.pacsave" -name "*.pacorig" -delete _msg_info "Done!" -- 1.7.12.3
Leave the work to the [nss-myhostname] package that is now in {base} and is configured by default in [filesystem] (/etc/nsswitch.conf). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/releng/root-image/etc/hosts | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 configs/releng/root-image/etc/hosts diff --git a/configs/releng/root-image/etc/hosts b/configs/releng/root-image/etc/hosts deleted file mode 100644 index d23291e..0000000 --- a/configs/releng/root-image/etc/hosts +++ /dev/null @@ -1,9 +0,0 @@ -# -# /etc/hosts: static lookup table for host names -# - -#<ip-address> <hostname.domain.org> <hostname> -127.0.0.1 localhost.localdomain localhost archiso -::1 localhost.localdomain localhost archiso - -# End of file -- 1.7.12.3
wooohoooo! Fixed in syslinux 4.06 :) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- docs/README.knowissues | 6 ------ docs/README.transfer | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/README.knowissues b/docs/README.knowissues index 24bfa41..c397afb 100644 --- a/docs/README.knowissues +++ b/docs/README.knowissues @@ -8,9 +8,3 @@ and device mapper devices made by archiso will be "free" on "shutdown tmpfs" (A.K.A deinitramfs), build at initramfs by [archiso_shutdown] initcpio hook. Proper shutdown is mostly important when persistent is used. - -** (2) syslinux 4.05 bug with relative directories on FAT: - - "Could not find kernel image: boot/syslinux/whichsys.c32" - This should be fixed in 4.06. For now, workaround with: - sed -i "s|../../|/arch|" /<MNT-TARGET-N>/arch/boot/syslinux/syslinux.cfg diff --git a/docs/README.transfer b/docs/README.transfer index e9654b8..83a7572 100644 --- a/docs/README.transfer +++ b/docs/README.transfer @@ -82,7 +82,7 @@ Note: Using here a MBR partition mode as example, but GPT should also works 4) Extract ISO image on target filesystem. # bsdtar -x --exclude=isolinux/ --exclude=EFI/ --exclude=loader/ -f <ISO-SOURCE> -C <MNT-TARGET-N> -5) Install syslinux bootloader on target filesystem. (See know issue (2) if using FAT) +5) Install syslinux bootloader on target filesystem. # extlinux -i <MNT-TARGET-N>/arch/boot/syslinux 6) Unmount target filesystem. -- 1.7.12.3
Am 23.10.2012 17:03, schrieb Gerardo Exequiel Pozzi:
wooohoooo! Fixed in syslinux 4.06 :)
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Finally!
participants (3)
-
Gerardo Exequiel Pozzi
-
Pierre Schmitz
-
Thomas Bächler