From 013ea1d83c07b4c5281b20acc9e9adb0efd030ca Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 23 Sep 2012 22:33:46 -0300 Subject: [configs/releng] Add some disk/part/fs tools Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.i686 | 5 +++++ configs/releng/packages.x86_64 | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'configs/releng') diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index be62a5a..194774c 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -12,6 +12,7 @@ dnsutils dosfstools efibootmgr elinks +fsarchiver gnu-netcat gptfdisk grml-zsh-config @@ -24,6 +25,7 @@ irssi lftp lilo linux-atm +mc mtools netcfg nfs-utils @@ -35,7 +37,9 @@ ntp openconnect openssh openvpn +partclone parted +partimage pptpclient rp-pppoe rsync @@ -43,6 +47,7 @@ smartmontools speedtouch sudo tcpdump +testdisk usb_modeswitch vpnc wget diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index a5be3c4..01a52d2 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -12,6 +12,7 @@ dnsutils dosfstools efibootmgr elinks +fsarchiver gnu-netcat gptfdisk grml-zsh-config @@ -25,6 +26,7 @@ irssi lftp lilo linux-atm +mc mtools netcfg nfs-utils @@ -36,7 +38,9 @@ ntp openconnect openssh openvpn +partclone parted +partimage pptpclient refind-efi-x86_64 rp-pppoe @@ -45,6 +49,7 @@ smartmontools speedtouch sudo tcpdump +testdisk usb_modeswitch vpnc wget -- cgit v1.2.3-54-g00ecf From 7fa34a628c9625ed557a5d9e30a056785a38272e Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 26 Sep 2012 12:22:54 -0300 Subject: [configs/releng] refind-efi-x86_64 -> refind-efi Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.x86_64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/releng') diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 01a52d2..fa43983 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -42,7 +42,7 @@ partclone parted partimage pptpclient -refind-efi-x86_64 +refind-efi rp-pppoe rsync smartmontools -- cgit v1.2.3-54-g00ecf From d902b8f32c58823fa8fa9f769e3603cfad657329 Mon Sep 17 00:00:00 2001 From: Keshav P R Date: Wed, 26 Sep 2012 12:24:41 -0300 Subject: [configs/releng] Use gummiboot-efi instead of UEFI Shell for booting Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 55 +++++++++++++++------- .../efiboot/loader/entries/archiso-x86_64-cd.conf | 4 ++ .../efiboot/loader/entries/archiso-x86_64-usb.conf | 4 ++ .../loader/entries/uefi-shell-v1-x86_64.conf | 2 + .../loader/entries/uefi-shell-v2-x86_64.conf | 2 + configs/releng/efiboot/loader/loader.conf | 2 + configs/releng/packages.x86_64 | 1 + 7 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf create mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf create mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf create mode 100644 configs/releng/efiboot/loader/loader.conf (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 63cbad0..0f2ebfb 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -69,6 +69,28 @@ make_boot() { make_boot_efi() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then if [[ ${arch} == "x86_64" ]]; then + ## Start - UEFI USB + + mkdir -p ${work_dir}/iso/EFI/boot + cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi + + mkdir -p ${work_dir}/iso/loader/entries + cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/loader.conf + cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/uefi-shell-v2-x86_64.conf + cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/uefi-shell-v1-x86_64.conf + + sed "s|%ARCHISO_LABEL%|${iso_label}|g; + s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf + + # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell ) + wget -O ${work_dir}/iso/EFI/shellx64_v2.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi + # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell ) + wget -O ${work_dir}/iso/EFI/shellx64_v1.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi + + ## End - UEFI USB + + ## Start - UEFI CD + mkdir -p ${work_dir}/iso/EFI/archiso dd of=${work_dir}/iso/EFI/archiso/efiboot.img bs=1 seek=20M count=0 mkfs.vfat ${work_dir}/iso/EFI/archiso/efiboot.img @@ -80,29 +102,28 @@ make_boot_efi() { cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/archiso/vmlinuz.efi cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img - # There are plans to support command line options via a config file (not yet in linux-3.3) - #cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/boot/bootx64.efi - #cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/boot/linux.img - #echo "archisolabel=${iso_label} initrd=\EFI\boot\linux.img" | iconv -f ascii -t ucs2 > ${work_dir}/iso/EFI/boot/linux.conf - - # For now, provide an EFI-shell until 'linux.conf' hits mainline. mkdir -p ${work_dir}/efiboot/EFI/boot - # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell ) - #wget -O ${work_dir}/efiboot/EFI/boot/bootx64.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi - # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell ) - wget -O ${work_dir}/efiboot/EFI/boot/bootx64.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi + cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi - # Add an EFI shell script for automatic boot if ESC-key is not pressed within 5 seconds timeout. - sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/EFI/boot/startup_iso.nsh > ${work_dir}/efiboot/EFI/boot/startup.nsh - - mkdir -p ${work_dir}/iso/EFI/boot - cp ${work_dir}/efiboot/EFI/boot/bootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi + mkdir -p ${work_dir}/efiboot/loader/entries + cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/loader.conf + cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf + cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/EFI/boot/startup_usb.nsh > ${work_dir}/iso/EFI/boot/startup.nsh + s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf + cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/shellx64_v2.efi + cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/shellx64_v1.efi + + # There are plans to support command line options via a config file (not yet in linux-3.3) + #cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/boot/bootx64.efi + #cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/boot/archiso.img + #echo "archisobasedir=${install_dir} archisolabel=${iso_label} initrd=\\EFI\\boot\\archiso.img" > ${work_dir}/efiboot/EFI/boot/linux.conf + umount ${work_dir}/efiboot + + ## End - UEFI CD fi : > ${work_dir}/build.${FUNCNAME} fi diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf new file mode 100644 index 0000000..9892c59 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -0,0 +1,4 @@ +title Arch Linux archiso x86_64 UEFI CD +linux /EFI/archiso/vmlinuz.efi +initrd /EFI/archiso/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf new file mode 100644 index 0000000..f61c532 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -0,0 +1,4 @@ +title Arch Linux archiso x86_64 UEFI USB +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz +initrd /%INSTALL_DIR%/boot/x86_64/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf new file mode 100644 index 0000000..9597ff2 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf @@ -0,0 +1,2 @@ +title UEFI Shell x86_64 v1 +efi /EFI/shellx64_v1.efi diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf new file mode 100644 index 0000000..0dde77a --- /dev/null +++ b/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf @@ -0,0 +1,2 @@ +title UEFI Shell x86_64 v2 +efi /EFI/shellx64_v2.efi diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf new file mode 100644 index 0000000..62c4a83 --- /dev/null +++ b/configs/releng/efiboot/loader/loader.conf @@ -0,0 +1,2 @@ +timeout 3 +default archiso-x86_64 diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index fa43983..35114ae 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -18,6 +18,7 @@ gptfdisk grml-zsh-config grub-bios grub-efi-x86_64 +gummiboot-efi haveged hdparm ipw2100-fw -- cgit v1.2.3-54-g00ecf From fb6e6b80b9c80783cae3cb46d10c4d9c0618f8a4 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 26 Sep 2012 12:24:41 -0300 Subject: [configs/releng] split make_boot_efi() -> make_efi() / make_efiboot() Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 0f2ebfb..5d573a2 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -65,19 +65,17 @@ make_boot() { fi } -# Prepare EFI "El Torito" boot image (using Linux >= 3.3 EFI boot stub) -make_boot_efi() { +make_efi() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then if [[ ${arch} == "x86_64" ]]; then - ## Start - UEFI USB mkdir -p ${work_dir}/iso/EFI/boot cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi mkdir -p ${work_dir}/iso/loader/entries - cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/loader.conf - cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/uefi-shell-v2-x86_64.conf - cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/uefi-shell-v1-x86_64.conf + cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/ + cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/ + cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/ sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf @@ -87,9 +85,14 @@ make_boot_efi() { # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell ) wget -O ${work_dir}/iso/EFI/shellx64_v1.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi - ## End - UEFI USB + fi + : > ${work_dir}/build.${FUNCNAME} + fi +} - ## Start - UEFI CD +make_efiboot() { + if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then + if [[ ${arch} == "x86_64" ]]; then mkdir -p ${work_dir}/iso/EFI/archiso dd of=${work_dir}/iso/EFI/archiso/efiboot.img bs=1 seek=20M count=0 @@ -106,24 +109,18 @@ make_boot_efi() { cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi mkdir -p ${work_dir}/efiboot/loader/entries - cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/loader.conf - cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf - cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf + cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/ + cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/ + cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/ sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf - cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/shellx64_v2.efi - cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/shellx64_v1.efi - - # There are plans to support command line options via a config file (not yet in linux-3.3) - #cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/boot/bootx64.efi - #cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/boot/archiso.img - #echo "archisobasedir=${install_dir} archisolabel=${iso_label} initrd=\\EFI\\boot\\archiso.img" > ${work_dir}/efiboot/EFI/boot/linux.conf - + cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/ + cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/ + umount ${work_dir}/efiboot - ## End - UEFI CD fi : > ${work_dir}/build.${FUNCNAME} fi @@ -293,7 +290,8 @@ make_common_single() { make_packages make_setup_mkinitcpio make_boot - make_boot_efi + make_efi + make_efiboot make_syslinux make_isolinux make_customize_root_image -- cgit v1.2.3-54-g00ecf From 340ebed2808517933e26e0d6f2bf1b6f957f03ef Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 26 Sep 2012 21:25:34 -0300 Subject: [configs/releng] Increase efiboot.img size * Increase size to a safe 31M, (currently we have 400K free since latest changes) * Also set a filesystem label, can be useful for future usage... Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 5d573a2..125be11 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -95,8 +95,8 @@ make_efiboot() { if [[ ${arch} == "x86_64" ]]; then mkdir -p ${work_dir}/iso/EFI/archiso - dd of=${work_dir}/iso/EFI/archiso/efiboot.img bs=1 seek=20M count=0 - mkfs.vfat ${work_dir}/iso/EFI/archiso/efiboot.img + truncate -s 31M ${work_dir}/iso/EFI/archiso/efiboot.img + mkfs.vfat -n ARCHISO_EFI ${work_dir}/iso/EFI/archiso/efiboot.img mkdir -p ${work_dir}/efiboot mount ${work_dir}/iso/EFI/archiso/efiboot.img ${work_dir}/efiboot -- cgit v1.2.3-54-g00ecf From dd032a2e72157eaa29bf1ab7b1b6dadfc902aa6f Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 3 Oct 2012 10:52:13 -0300 Subject: [configs/releng] Add pacman-init.service Signed-off-by: Gerardo Exequiel Pozzi --- .../root-image/etc/systemd/system/pacman-init.service | 13 +++++++++++++ configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 configs/releng/root-image/etc/systemd/system/pacman-init.service create mode 100644 configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf (limited to 'configs/releng') diff --git a/configs/releng/root-image/etc/systemd/system/pacman-init.service b/configs/releng/root-image/etc/systemd/system/pacman-init.service new file mode 100644 index 0000000..2154476 --- /dev/null +++ b/configs/releng/root-image/etc/systemd/system/pacman-init.service @@ -0,0 +1,13 @@ +[Unit] +Description=Initializes Pacman keyring +Wants=haveged.service +After=haveged.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/pacman-key --init +ExecStart=/usr/bin/pacman-key --populate archlinux + +[Install] +WantedBy=multi-user.target diff --git a/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf b/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf new file mode 100644 index 0000000..8f3d6c9 --- /dev/null +++ b/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf @@ -0,0 +1,2 @@ +d /run/pacman.d/gnupg - - - - - +L /etc/pacman.d/gnupg - - - - /run/pacman.d/gnupg -- cgit v1.2.3-54-g00ecf From 0dc8c7b3c7ddcbfe74384d6da596c68f5f268ad9 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 3 Oct 2012 10:52:13 -0300 Subject: [configs/releng] Add autologin.service Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 125be11..b760256 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -174,6 +174,8 @@ make_customize_root_image() { sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist patch ${work_dir}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch sed -i 's/#\(en_US\.UTF-8\)/\1/' ${work_dir}/root-image/etc/locale.gen + sed 's#\(^ExecStart=-/sbin/agetty\)#\1 --autologin root#' \ + ${work_dir}/root-image/usr/lib/systemd/system/getty@.service > ${work_dir}/root-image/etc/systemd/system/autologin@.service mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ -r 'locale-gen' \ run -- cgit v1.2.3-54-g00ecf From e8d8124dd217c25b619deae1c6a5ebcac0cbe41d Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 3 Oct 2012 10:52:13 -0300 Subject: [configs/releng] Enable systemd services Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index b760256..0b4001b 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -185,6 +185,9 @@ make_customize_root_image() { mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" -s /bin/zsh arch' \ run + mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ + -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd@.service ntpd.service || true' \ + run : > ${work_dir}/build.${FUNCNAME} fi } -- cgit v1.2.3-54-g00ecf From 56b1e931bc27def5d0a3b51a6282653389fac732 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 3 Oct 2012 10:52:13 -0300 Subject: [configs/releng] Install systemd as default (with sysvcompat) Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 0b4001b..2fa5d50 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -26,6 +26,14 @@ setup_workdir() { make_basefs() { mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" init mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd curl" install + + # Install systemd-sysvcompat in this way until hits {base} group + mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ + -r 'pacman -R --noconfirm --noprogressbar initscripts sysvinit' \ + run + mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ + -p "systemd-sysvcompat" \ + install } # Additional packages (root-image) -- cgit v1.2.3-54-g00ecf From d5e1363cbb2409be82ec53cdf428ab752a4e2c79 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 3 Oct 2012 10:52:13 -0300 Subject: [configs/releng] Remove files for sysvinit and initscripts Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/root-image/etc/archiso/functions | 20 --------- configs/releng/root-image/etc/inittab | 48 ---------------------- configs/releng/root-image/etc/rc.conf | 23 ----------- .../etc/rc.d/functions.d/automated_script | 23 ----------- .../etc/rc.d/functions.d/setup_special_console | 25 ----------- configs/releng/root-image/etc/rc.d/pacman-init | 34 --------------- 6 files changed, 173 deletions(-) delete mode 100644 configs/releng/root-image/etc/archiso/functions delete mode 100644 configs/releng/root-image/etc/inittab delete mode 100644 configs/releng/root-image/etc/rc.conf delete mode 100644 configs/releng/root-image/etc/rc.d/functions.d/automated_script delete mode 100644 configs/releng/root-image/etc/rc.d/functions.d/setup_special_console delete mode 100755 configs/releng/root-image/etc/rc.d/pacman-init (limited to 'configs/releng') diff --git a/configs/releng/root-image/etc/archiso/functions b/configs/releng/root-image/etc/archiso/functions deleted file mode 100644 index 9fffdcb..0000000 --- a/configs/releng/root-image/etc/archiso/functions +++ /dev/null @@ -1,20 +0,0 @@ -# vim: set ft=sh: - -# kernel_cmdline -# Looks for a parameter on the kernel's boot-time command line. -# -# returns: 0 if param was found. Also prints its value if it was a K=V param. -# 1 if it was not. Also prints value passed as -# -kernel_cmdline () -{ - for param in $(/bin/cat /proc/cmdline); do - case "${param}" in - $1=*) echo "${param##*=}"; return 0 ;; - $1) return 0 ;; - *) continue ;; - esac - done - [ -n "${2}" ] && echo "${2}" - return 1 -} diff --git a/configs/releng/root-image/etc/inittab b/configs/releng/root-image/etc/inittab deleted file mode 100644 index e3fe2c8..0000000 --- a/configs/releng/root-image/etc/inittab +++ /dev/null @@ -1,48 +0,0 @@ -# -# /etc/inittab -# - -# Runlevels: -# 0 Halt -# 1(S) Single-user -# 2 Not used -# 3 Multi-user -# 4 Not used -# 5 X11 -# 6 Reboot - -## Only one of the following two lines can be uncommented! -# Boot to console -id:3:initdefault: -# Boot to X11 -#id:5:initdefault: - -rc::sysinit:/etc/rc.sysinit -rs:S1:wait:/etc/rc.single -rm:2345:wait:/etc/rc.multi -rh:06:wait:/etc/rc.shutdown -su:S:wait:/sbin/sulogin -p - -# -8 options fixes umlauts problem on login -c1:2345:respawn:/sbin/agetty -8 -s -a root 38400 tty1 linux -c2:2345:respawn:/sbin/agetty -8 -s 38400 tty2 linux -c3:2345:respawn:/sbin/agetty -8 -s 38400 tty3 linux -c4:2345:respawn:/sbin/agetty -8 -s 38400 tty4 linux -c5:2345:respawn:/sbin/agetty -8 -s 38400 tty5 linux -c6:2345:respawn:/sbin/agetty -8 -s 38400 tty6 linux - -# Serial Virtual Console for KVM and others VMs -#s0:2345:respawn:/sbin/agetty -8 -s 9600 ttyS0 linux - -# Hypervisor Virtual Console for Xen and KVM -#h0:2345:respawn:/sbin/agetty -8 -s 38400 hvc0 linux - -ca::ctrlaltdel:/sbin/shutdown -t3 -r now - -# Example lines for starting a login manager -x:5:respawn:/usr/bin/xdm -nodaemon -#x:5:respawn:/usr/sbin/gdm -nodaemon -#x:5:respawn:/usr/bin/kdm -nodaemon -#x:5:respawn:/usr/bin/slim >/dev/null 2>&1 - -# End of file diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf deleted file mode 100644 index a2e6ebf..0000000 --- a/configs/releng/root-image/etc/rc.conf +++ /dev/null @@ -1,23 +0,0 @@ -. /etc/archiso/functions -# -# /etc/rc.conf - configuration file for initscripts -# -# Most of rc.conf has been replaced by various other configuration -# files. See archlinux(7) for details. -# -# For more details on rc.conf see rc.conf(5). -# - -DAEMONS=(syslog-ng network haveged pacman-init) - -# Storage -# -# USEDMRAID="no" -# USELVM="no" - -# Network -# -# interface= -# address= -# netmask= -# gateway= diff --git a/configs/releng/root-image/etc/rc.d/functions.d/automated_script b/configs/releng/root-image/etc/rc.d/functions.d/automated_script deleted file mode 100644 index f3e9018..0000000 --- a/configs/releng/root-image/etc/rc.d/functions.d/automated_script +++ /dev/null @@ -1,23 +0,0 @@ -automated_script () -{ - script="$(kernel_cmdline script)" - if [[ -n "${script}" ]]; then - stat_busy "Configuring $script" - if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then - wget "${script}" -q -O /tmp/startup_script >/dev/null - rt=$? - else - cp "${script}" /tmp/startup_script - rt=$? - fi - if [ ${rt} -eq 0 ]; then - chmod +x /tmp/startup_script - echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n /tmp/startup_script\nfi\n' >> /root/.zprofile - stat_done - else - stat_fail - fi - fi -} - -add_hook multi_end automated_script diff --git a/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console b/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console deleted file mode 100644 index 7badfe3..0000000 --- a/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console +++ /dev/null @@ -1,25 +0,0 @@ -# If an alternate console was specified on the kernel command line, -# start agetty on it too. -setup_special_console() -{ - local cmdline_console - if cmdline_console=$(kernel_cmdline console); then - stat_busy "Starting agetty on console: ${cmdline_console}" - local port options baud rts - port=${cmdline_console%%,*} - options=${cmdline_console#${port}} - options=${options#,} - baud=${options%%[neo]*} - [[ ${options} == *r ]] && rts="-h" - if ! grep -q "^${port}" /etc/securetty; then - echo ${port} >> /etc/securetty - fi - if ! grep -q "^z0:" /etc/inittab; then - echo "z0:2345:respawn:/sbin/agetty -8 -s ${rts} ${baud:-9600} ${port} linux" >> /etc/inittab - fi - /sbin/telinit q - stat_done - fi -} - -add_hook sysinit_end setup_special_console diff --git a/configs/releng/root-image/etc/rc.d/pacman-init b/configs/releng/root-image/etc/rc.d/pacman-init deleted file mode 100755 index bbbd719..0000000 --- a/configs/releng/root-image/etc/rc.d/pacman-init +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Initializing pacman keyring" - if { pacman-key --init && pacman-key --populate archlinux; } &>/dev/null; then - add_daemon pacman-init - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Removing pacman keyring" - rm -rf /etc/pacman.d/gnupg - rm_daemon pacman-init - stat_done - ;; - - restart) - $0 stop - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 -- cgit v1.2.3-54-g00ecf From d552ad32ab7001766ec2cdf6d2c555e91267a7cb Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 3 Oct 2012 10:52:13 -0300 Subject: [configs/releng] Rework automated_script() from initscript hooks to /root/.zlogin Signed-off-by: Gerardo Exequiel Pozzi --- .../releng/root-image/root/.automated_script.sh | 34 ++++++++++++++++++++++ configs/releng/root-image/root/.zlogin | 1 + 2 files changed, 35 insertions(+) create mode 100755 configs/releng/root-image/root/.automated_script.sh create mode 100644 configs/releng/root-image/root/.zlogin (limited to 'configs/releng') diff --git a/configs/releng/root-image/root/.automated_script.sh b/configs/releng/root-image/root/.automated_script.sh new file mode 100755 index 0000000..fb106da --- /dev/null +++ b/configs/releng/root-image/root/.automated_script.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +script_cmdline () +{ + local param + for param in $(< /proc/cmdline); do + case "${param}" in + script=*) echo "${param##*=}" ; return 0 ;; + esac + done +} + +automated_script () +{ + local script rt + script="$(script_cmdline)" + if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then + if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then + wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null + rt=$? + else + cp "${script}" /tmp/startup_script + rt=$? + fi + if [[ ${rt} -eq 0 ]]; then + chmod +x /tmp/startup_script + /tmp/startup_script + fi + fi +} + +if [[ $(tty) == "/dev/tty1" ]]; then + automated_script +fi diff --git a/configs/releng/root-image/root/.zlogin b/configs/releng/root-image/root/.zlogin new file mode 100644 index 0000000..f598e43 --- /dev/null +++ b/configs/releng/root-image/root/.zlogin @@ -0,0 +1 @@ +~/.automated_script.sh -- cgit v1.2.3-54-g00ecf From 6ef682f16dcf1d88cbc7541fc9ef2fbd185d5c00 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 3 Oct 2012 10:52:13 -0300 Subject: [configs/releng] Add timestamp to initramfs Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/mkinitcpio.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/releng') diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index 12a656d..03af40c 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms pata scsi sata virtio usb fw pcmcia filesystems usbinput" +HOOKS="base udev timestamp memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms pata scsi sata virtio usb fw pcmcia filesystems usbinput" COMPRESSION="xz" -- cgit v1.2.3-54-g00ecf From 72b34f572ec2f1c2e8f1af88e742853726200178 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 4 Oct 2012 19:21:08 -0300 Subject: [configs/releng] Add ethtool to live-enviroment FS#28773 - [ethtool] [net-tools] one of packages should belong to base group Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.i686 | 1 + configs/releng/packages.x86_64 | 1 + 2 files changed, 2 insertions(+) (limited to 'configs/releng') diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index 194774c..b300c60 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -12,6 +12,7 @@ dnsutils dosfstools efibootmgr elinks +ethtool fsarchiver gnu-netcat gptfdisk diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 35114ae..4d93c78 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -12,6 +12,7 @@ dnsutils dosfstools efibootmgr elinks +ethtool fsarchiver gnu-netcat gptfdisk -- cgit v1.2.3-54-g00ecf From d2e69f4a4a54cf63e57c672919a2e714eb601d36 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 5 Oct 2012 06:55:36 +0200 Subject: Disable ntpd service by default A live system should never alter the host system in any way. This includes setting the bios clock. E.g. if the user runs his system in local time we would do the wrong thing here. Signed-off-by: Pierre Schmitz --- configs/releng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 2fa5d50..0d93ccd 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -194,7 +194,7 @@ make_customize_root_image() { -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" -s /bin/zsh arch' \ run mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd@.service ntpd.service || true' \ + -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd@.service || true' \ run : > ${work_dir}/build.${FUNCNAME} fi -- cgit v1.2.3-54-g00ecf From 41def4c27d8eb859ace91c00eefa915dbb4c38fc Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 5 Oct 2012 11:32:28 +0200 Subject: Run dhcpcd on all devices As we did with initscripts, run dhcpcd on all devices and not just eth0. Signed-off-by: Pierre Schmitz --- configs/releng/build.sh | 2 +- configs/releng/root-image/etc/conf.d/dhcpcd | 6 ------ configs/releng/root-image/etc/systemd/system/dhcpcd.service | 13 +++++++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 configs/releng/root-image/etc/conf.d/dhcpcd create mode 100644 configs/releng/root-image/etc/systemd/system/dhcpcd.service (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 0d93ccd..3601dff 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -194,7 +194,7 @@ make_customize_root_image() { -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" -s /bin/zsh arch' \ run mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd@.service || true' \ + -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd.service || true' \ run : > ${work_dir}/build.${FUNCNAME} fi diff --git a/configs/releng/root-image/etc/conf.d/dhcpcd b/configs/releng/root-image/etc/conf.d/dhcpcd deleted file mode 100644 index 76b56ff..0000000 --- a/configs/releng/root-image/etc/conf.d/dhcpcd +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP client daemon -# - -DHCPCD_ARGS="-qb" - diff --git a/configs/releng/root-image/etc/systemd/system/dhcpcd.service b/configs/releng/root-image/etc/systemd/system/dhcpcd.service new file mode 100644 index 0000000..dd030d5 --- /dev/null +++ b/configs/releng/root-image/etc/systemd/system/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on all interfaces +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd.pid +ExecStart=/sbin/dhcpcd -A -b -q +ExecStop=/sbin/dhcpcd -k + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf From 99ae5779460a23f5d2751777dd13dc009f63cfbe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 5 Oct 2012 11:51:38 +0200 Subject: Place the x86_64 boot before i686 This is a very minor change, but let's most people just press enter on bootup. Signed-off-by: Pierre Schmitz --- configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg | 2 +- configs/releng/syslinux.dual/archiso_sys_both_inc.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configs/releng') diff --git a/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg b/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg index 324523e..1593303 100644 --- a/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg +++ b/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg @@ -1,4 +1,4 @@ INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_pxe32.cfg INCLUDE boot/syslinux/archiso_pxe64.cfg +INCLUDE boot/syslinux/archiso_pxe32.cfg INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg b/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg index 4ed6b39..e885c40 100644 --- a/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg +++ b/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg @@ -1,4 +1,4 @@ INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_sys32.cfg INCLUDE boot/syslinux/archiso_sys64.cfg +INCLUDE boot/syslinux/archiso_sys32.cfg INCLUDE boot/syslinux/archiso_tail.cfg -- cgit v1.2.3-54-g00ecf From 077e81e4585a2490f4fa9251a9f3602c9ed4ce02 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 5 Oct 2012 12:27:42 +0200 Subject: Add rfkill to the live system Some wireless devices need to be enabled before use which is easier using rfkill. Signed-off-by: Pierre Schmitz --- configs/releng/packages.i686 | 1 + configs/releng/packages.x86_64 | 1 + 2 files changed, 2 insertions(+) (limited to 'configs/releng') diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index b300c60..032b666 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -42,6 +42,7 @@ partclone parted partimage pptpclient +rfkill rp-pppoe rsync smartmontools diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 4d93c78..21ab1c8 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -45,6 +45,7 @@ parted partimage pptpclient refind-efi +rfkill rp-pppoe rsync smartmontools -- cgit v1.2.3-54-g00ecf From 76f275e993eec849bd7c03dc42504b6214774a85 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 6 Oct 2012 00:24:24 +0200 Subject: Use tmpfs for /etc/pacman.d/gnupg instead of a symlink to /run This fixes FS#31815 Signed-off-by: Pierre Schmitz --- archiso/initcpio/hooks/archiso | 1 - configs/releng/root-image/etc/fstab | 0 .../releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount | 8 ++++++++ configs/releng/root-image/etc/systemd/system/pacman-init.service | 2 ++ configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf | 2 -- 5 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 configs/releng/root-image/etc/fstab create mode 100644 configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount delete mode 100644 configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf (limited to 'configs/releng') diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index 9445498..5b94743 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -35,7 +35,6 @@ _mnt_fs() { _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/archiso/used_block_devices - echo "/dev/mapper/${dm_snap_name} ${mnt} auto defaults 0 0" >> ${newroot}/etc/fstab } # args: /path/to/image_file, mountpoint diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab new file mode 100644 index 0000000..e69de29 diff --git a/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount b/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount new file mode 100644 index 0000000..4eab551 --- /dev/null +++ b/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount @@ -0,0 +1,8 @@ +[Unit] +Description=Temporary /etc/pacman.d/gnupg directory + +[Mount] +What=tmpfs +Where=/etc/pacman.d/gnupg +Type=tmpfs +Options=mode=0755 diff --git a/configs/releng/root-image/etc/systemd/system/pacman-init.service b/configs/releng/root-image/etc/systemd/system/pacman-init.service index 2154476..23b8144 100644 --- a/configs/releng/root-image/etc/systemd/system/pacman-init.service +++ b/configs/releng/root-image/etc/systemd/system/pacman-init.service @@ -2,6 +2,8 @@ Description=Initializes Pacman keyring Wants=haveged.service After=haveged.service +Requires=etc-pacman.d-gnupg.mount +After=etc-pacman.d-gnupg.mount [Service] Type=oneshot diff --git a/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf b/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf deleted file mode 100644 index 8f3d6c9..0000000 --- a/configs/releng/root-image/etc/tmpfiles.d/pacman-init.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /run/pacman.d/gnupg - - - - - -L /etc/pacman.d/gnupg - - - - /run/pacman.d/gnupg -- cgit v1.2.3-54-g00ecf From d355c2b83527d3f0c08c6e800b975a613a169c9d Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 6 Oct 2012 00:27:18 +0200 Subject: Only enable the needed services * pacman-init already pulls in services it depends on * the multi-user.target is the default * do not rename the getty service so tools like systemd-delta still work Signed-off-by: Pierre Schmitz --- configs/releng/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 3601dff..3f246d4 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -183,7 +183,7 @@ make_customize_root_image() { patch ${work_dir}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch sed -i 's/#\(en_US\.UTF-8\)/\1/' ${work_dir}/root-image/etc/locale.gen sed 's#\(^ExecStart=-/sbin/agetty\)#\1 --autologin root#' \ - ${work_dir}/root-image/usr/lib/systemd/system/getty@.service > ${work_dir}/root-image/etc/systemd/system/autologin@.service + ${work_dir}/root-image/usr/lib/systemd/system/getty@.service > ${work_dir}/root-image/etc/systemd/system/getty@.service mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ -r 'locale-gen' \ run @@ -194,7 +194,7 @@ make_customize_root_image() { -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" -s /bin/zsh arch' \ run mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd.service || true' \ + -r 'systemctl -f enable pacman-init.service getty@.service dhcpcd.service || true' \ run : > ${work_dir}/build.${FUNCNAME} fi -- cgit v1.2.3-54-g00ecf From 7d26b1eae9ba9e3ea0a5c9f7c8e6f12118d2f019 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 6 Oct 2012 07:20:59 +0200 Subject: Add the arch user to some useful groups Only use groups that wont allow damaging the host system by accident. Signed-off-by: Pierre Schmitz --- configs/releng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 3f246d4..2699468 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -191,7 +191,7 @@ make_customize_root_image() { -r 'usermod -s /bin/zsh root' \ run mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" -s /bin/zsh arch' \ + -r 'useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /bin/zsh arch' \ run mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ -r 'systemctl -f enable pacman-init.service getty@.service dhcpcd.service || true' \ -- cgit v1.2.3-54-g00ecf From 76ef155a04effa6741f4db2384eba90671a2fdba Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Oct 2012 14:40:40 -0300 Subject: [configs/releng] make packages.both for common packages for each x86_64 Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 2 +- configs/releng/packages.both | 60 +++++++++++++++++++++++++++++++++++++++++ configs/releng/packages.i686 | 61 ------------------------------------------ configs/releng/packages.x86_64 | 61 ------------------------------------------ 4 files changed, 61 insertions(+), 123 deletions(-) create mode 100644 configs/releng/packages.both (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 2699468..ab8097c 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -38,7 +38,7 @@ make_basefs() { # Additional packages (root-image) make_packages() { - mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" install + mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install } # Copy mkinitcpio archiso hooks (root-image) diff --git a/configs/releng/packages.both b/configs/releng/packages.both new file mode 100644 index 0000000..4bab7de --- /dev/null +++ b/configs/releng/packages.both @@ -0,0 +1,60 @@ +arch-install-scripts +b43-fwcutter +btrfs-progs +crda +darkhttpd +ddrescue +dhclient +dialog +dmraid +dnsmasq +dnsutils +dosfstools +elinks +ethtool +fsarchiver +gnu-netcat +gptfdisk +grml-zsh-config +grub-bios +haveged +hdparm +ipw2100-fw +ipw2200-fw +irssi +lftp +lilo +linux-atm +mc +mtools +netcfg +nfs-utils +nilfs-utils +nmap +ntfs-3g +ntfsprogs +ntp +openconnect +openssh +openvpn +partclone +parted +partimage +pptpclient +rfkill +rp-pppoe +rsync +smartmontools +speedtouch +sudo +tcpdump +testdisk +usb_modeswitch +vpnc +wget +wireless_tools +wpa_actiond +wvdial +xl2tpd +zd1211-firmware +zsh diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index 032b666..e69de29 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -1,61 +0,0 @@ -arch-install-scripts -b43-fwcutter -btrfs-progs -crda -darkhttpd -ddrescue -dhclient -dialog -dmraid -dnsmasq -dnsutils -dosfstools -efibootmgr -elinks -ethtool -fsarchiver -gnu-netcat -gptfdisk -grml-zsh-config -grub-bios -haveged -hdparm -ipw2100-fw -ipw2200-fw -irssi -lftp -lilo -linux-atm -mc -mtools -netcfg -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntfsprogs -ntp -openconnect -openssh -openvpn -partclone -parted -partimage -pptpclient -rfkill -rp-pppoe -rsync -smartmontools -speedtouch -sudo -tcpdump -testdisk -usb_modeswitch -vpnc -wget -wireless_tools -wpa_actiond -wvdial -xl2tpd -zd1211-firmware -zsh diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 21ab1c8..137c9d5 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,64 +1,3 @@ -arch-install-scripts -b43-fwcutter -btrfs-progs -crda -darkhttpd -ddrescue -dhclient -dialog -dmraid -dnsmasq -dnsutils -dosfstools -efibootmgr -elinks -ethtool -fsarchiver -gnu-netcat -gptfdisk -grml-zsh-config -grub-bios grub-efi-x86_64 gummiboot-efi -haveged -hdparm -ipw2100-fw -ipw2200-fw -irssi -lftp -lilo -linux-atm -mc -mtools -netcfg -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntfsprogs -ntp -openconnect -openssh -openvpn -partclone -parted -partimage -pptpclient refind-efi -rfkill -rp-pppoe -rsync -smartmontools -speedtouch -sudo -tcpdump -testdisk -usb_modeswitch -vpnc -wget -wireless_tools -wpa_actiond -wvdial -xl2tpd -zd1211-firmware -zsh -- cgit v1.2.3-54-g00ecf From 0e5b68e0d3122adffd16d48fdb5c93e858ddaf32 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Oct 2012 14:40:41 -0300 Subject: [configs/releng] Remove unused files (startup*.nsh) These files was used with efi-shell boot method, before gummiboot comes here. Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/efiboot/EFI/boot/startup_iso.nsh | 10 ---------- configs/releng/efiboot/EFI/boot/startup_usb.nsh | 10 ---------- 2 files changed, 20 deletions(-) delete mode 100644 configs/releng/efiboot/EFI/boot/startup_iso.nsh delete mode 100644 configs/releng/efiboot/EFI/boot/startup_usb.nsh (limited to 'configs/releng') diff --git a/configs/releng/efiboot/EFI/boot/startup_iso.nsh b/configs/releng/efiboot/EFI/boot/startup_iso.nsh deleted file mode 100644 index 5c35ca8..0000000 --- a/configs/releng/efiboot/EFI/boot/startup_iso.nsh +++ /dev/null @@ -1,10 +0,0 @@ -@echo -off - -for %m run (0 20) - if exist fs%m:\EFI\archiso\vmlinuz.efi then - fs%m: - cd fs%m:\EFI\archiso - echo "Launching Arch Linux ISO Kernel fs%m:\EFI\archiso\vmlinuz.efi" - vmlinuz.efi archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% initrd=\EFI\archiso\archiso.img - endif -endfor diff --git a/configs/releng/efiboot/EFI/boot/startup_usb.nsh b/configs/releng/efiboot/EFI/boot/startup_usb.nsh deleted file mode 100644 index 439e400..0000000 --- a/configs/releng/efiboot/EFI/boot/startup_usb.nsh +++ /dev/null @@ -1,10 +0,0 @@ -@echo -off - -for %m run (0 20) - if exist fs%m:\%INSTALL_DIR%\boot\x86_64\vmlinuz then - fs%m: - cd fs%m:\%INSTALL_DIR%\boot\x86_64 - echo "Launching Archiso Kernel fs%m:\%INSTALL_DIR%\boot\x86_64\vmlinuz" - vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% initrd=\%INSTALL_DIR%\boot\x86_64\archiso.img - endif -endfor -- cgit v1.2.3-54-g00ecf From f712182592d90c87bccc4f3d7e67f55d2d6055af Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Oct 2012 14:40:41 -0300 Subject: [configs/releng] /etc/timezone is not used anymore Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/root-image/etc/timezone | 1 - 1 file changed, 1 deletion(-) delete mode 100644 configs/releng/root-image/etc/timezone (limited to 'configs/releng') diff --git a/configs/releng/root-image/etc/timezone b/configs/releng/root-image/etc/timezone deleted file mode 100644 index e2e7775..0000000 --- a/configs/releng/root-image/etc/timezone +++ /dev/null @@ -1 +0,0 @@ -UTC -- cgit v1.2.3-54-g00ecf From b2691db41a9c46adf98b8fe9891a306eec6de811 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Oct 2012 14:40:41 -0300 Subject: [configs/releng] /etc/vconsole.conf remove, redundant systemd does not touch anymore FONT and KEYMAP by default. Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/root-image/etc/vconsole.conf | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 configs/releng/root-image/etc/vconsole.conf (limited to 'configs/releng') diff --git a/configs/releng/root-image/etc/vconsole.conf b/configs/releng/root-image/etc/vconsole.conf deleted file mode 100644 index c58bf7e..0000000 --- a/configs/releng/root-image/etc/vconsole.conf +++ /dev/null @@ -1,2 +0,0 @@ -KEYMAP=us -FONT= -- cgit v1.2.3-54-g00ecf From 2e94974e2b37b540d52799362f05e16315cb0b00 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Oct 2012 14:40:41 -0300 Subject: [configs/releng] Remove uneeded hack (systemd transition) initscripts/sysvinit are not part from {base} anymore, systemd* is now in {base}. Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 8 -------- 1 file changed, 8 deletions(-) (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index ab8097c..cd9b45a 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -26,14 +26,6 @@ setup_workdir() { make_basefs() { mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" init mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd curl" install - - # Install systemd-sysvcompat in this way until hits {base} group - mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'pacman -R --noconfirm --noprogressbar initscripts sysvinit' \ - run - mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -p "systemd-sysvcompat" \ - install } # Additional packages (root-image) -- cgit v1.2.3-54-g00ecf