From c1918d0d3f9d4ead3519168fb88568a6ab00f584 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sun, 31 Dec 2017 21:33:44 -0500 Subject: stash --- configs/profile/build.sh | 4 ++++ configs/profile/root-image/etc/skel/install-openrc-lxde.sh | 2 +- configs/profile/root-image/etc/skel/install-systemd-mate.sh | 2 +- .../root-image/etc/systemd/system/pacman-init.service | 4 +--- .../root-image/root/customize_root_image-constants.inc | 13 +++++++------ configs/profile/root-image/root/install-openrc-lxde.sh | 5 ----- configs/profile/root-image/root/install-systemd-mate.sh | 5 ----- 7 files changed, 14 insertions(+), 21 deletions(-) delete mode 100755 configs/profile/root-image/root/install-openrc-lxde.sh delete mode 100755 configs/profile/root-image/root/install-systemd-mate.sh diff --git a/configs/profile/build.sh b/configs/profile/build.sh index e52cb86..d3e519f 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -149,6 +149,8 @@ make_packages() { fi # refresh pacman keyring in chroot +cp -r /etc/pacman.d/gnupg/ ./hostgnupg/ +cp -r ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ./chrootgnupg/ arch-chroot ${work_dir}/${arch}/root-image rm -rf /etc/pacman.d/gnupg/ && \ pacman-key --init && \ pacman -S --noconfirm archlinux-keyring \ @@ -162,6 +164,8 @@ make_packages() { archlinux32-keyring \ archlinuxarm-keyring \ parabola-keyring ; +echo "ls ./hostgnupg/" ; ls -al /etc/pacman.d/gnupg/ ./hostgnupg/ +echo "ls ./chrootgnupg/" ; ls -al ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ./chrootgnupg/ } # Copy mkinitcpio parabolaiso hooks and build initramfs (root-image) diff --git a/configs/profile/root-image/etc/skel/install-openrc-lxde.sh b/configs/profile/root-image/etc/skel/install-openrc-lxde.sh index 4267391..d2600d4 100755 --- a/configs/profile/root-image/etc/skel/install-openrc-lxde.sh +++ b/configs/profile/root-image/etc/skel/install-openrc-lxde.sh @@ -1,4 +1,4 @@ #!/bin/sh -sudo /root/install-openrc-lxde.sh +sudo /root/.install-openrc-lxde/install.sh diff --git a/configs/profile/root-image/etc/skel/install-systemd-mate.sh b/configs/profile/root-image/etc/skel/install-systemd-mate.sh index d0ae159..dee2747 100755 --- a/configs/profile/root-image/etc/skel/install-systemd-mate.sh +++ b/configs/profile/root-image/etc/skel/install-systemd-mate.sh @@ -1,4 +1,4 @@ #!/bin/sh -sudo /root/install-systemd-mate.sh +/root/.install-systemd-mate/install.sh diff --git a/configs/profile/root-image/etc/systemd/system/pacman-init.service b/configs/profile/root-image/etc/systemd/system/pacman-init.service index 5d90af9..7ac2db6 100644 --- a/configs/profile/root-image/etc/systemd/system/pacman-init.service +++ b/configs/profile/root-image/etc/systemd/system/pacman-init.service @@ -9,9 +9,7 @@ After=etc-pacman.d-gnupg.mount Type=oneshot RemainAfterExit=yes ExecStart=/usr/bin/pacman-key --init -ExecStart=/usr/bin/pacman-key --populate archlinux -ExecStart=/usr/bin/pacman-key --populate archlinux32 -ExecStart=/usr/bin/pacman-key --populate parabola +ExecStart=/usr/bin/pacman-key --populate archlinux archlinux32 archlinuxarm parabola [Install] WantedBy=multi-user.target diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc index 1e7fa20..e55744a 100644 --- a/configs/profile/root-image/root/customize_root_image-constants.inc +++ b/configs/profile/root-image/root/customize_root_image-constants.inc @@ -9,8 +9,7 @@ readonly LOCALES="en_US\.UTF-8 \ readonly SYSTEMD_DELETE_FILES="/etc/conf.d/agetty.tty1 \ /etc/conf.d/hostname \ /etc/init.d/pacman-init \ - /etc/X11/Xwrapper.config \ -/etc/systemd/system/pacman-init.service " + /etc/X11/Xwrapper.config" readonly OPENRC_DELETE_FILES="/etc/hostname \ /etc/systemd/scripts/choose-mirror \ /etc/systemd/system/choose-mirror.service \ @@ -18,7 +17,8 @@ readonly OPENRC_DELETE_FILES="/etc/hostname /etc/systemd/system/getty@tty1.service.d/autologin.conf \ /etc/systemd/system/pacman-init.service " readonly SYSTEMD_SERVICES_ALL="choose-mirror.service \ - multi-user.target " + multi-user.target \ + pacman-init.service " readonly SYSTEMD_SERVICES_GUI="NetworkManager.service" readonly OPENRC_SERVICES_ALL="dbus \ haveged \ @@ -39,9 +39,10 @@ readonly COMPLETE_MSG="This ISO is capable of installing a complete Parabola sys # cp /etc/pacman-online.conf /etc/pacman.conf" [ "${enable_offline_install}" == 'false' ] && readonly NETWORK_MOTD_MSG=${NETINSTALL_MSG} || \ readonly NETWORK_MOTD_MSG=${COMPLETE_MSG} -readonly ROOT_SKEL_FILES="/etc/skel/.automated_script.sh \ - /etc/skel/.bash_logout \ - /etc/skel/.bash_profile " +readonly ROOT_SKEL_FILES="/etc/skel/.bash_logout \ + /etc/skel/.bash_profile \ + /etc/skel/install-openrc-lxde.sh \ + /etc/skel/install-systemd-mate.sh" readonly LIVE_USER=parabola readonly LIVE_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" readonly OPENRC_USER_GROUPS="disk,sys" diff --git a/configs/profile/root-image/root/install-openrc-lxde.sh b/configs/profile/root-image/root/install-openrc-lxde.sh deleted file mode 100755 index 12fd970..0000000 --- a/configs/profile/root-image/root/install-openrc-lxde.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - - -/root/.language.sh -/root/.install-openrc-lxde/install.sh diff --git a/configs/profile/root-image/root/install-systemd-mate.sh b/configs/profile/root-image/root/install-systemd-mate.sh deleted file mode 100755 index 8b18903..0000000 --- a/configs/profile/root-image/root/install-systemd-mate.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - - -/root/.language.sh -/root/.install-systemd-mate/install.sh -- cgit v1.2.2