Merge branch 'Issue-221-223' into dev

Hayao0819 · Hayao0819 · commit 792c307c95cd · 2020-12-16T19:27:30.000+09:00
diff --git a/channels/basic/airootfs.any/root/optimize_for_tarball.sh b/channels/basic/airootfs.any/root/optimize_for_tarball.sh
@@ -42,5 +42,5 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
diff --git a/channels/basic/airootfs.any/usr/share/calamares/final-process b/channels/basic/airootfs.any/usr/share/calamares/final-process
@@ -41,5 +41,5 @@ if [[ -f /etc/systemd/journald.conf ]]; then
     sed -i 's / Storage = volatile /＃Storage = auto /' /etc/systemd/journald.conf
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
diff --git a/channels/cinnamon/airootfs.any/root/optimize_for_tarball.sh b/channels/cinnamon/airootfs.any/root/optimize_for_tarball.sh
@@ -42,7 +42,7 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/cinnamon/airootfs.any/usr/share/calamares/final-process b/channels/cinnamon/airootfs.any/usr/share/calamares/final-process
@@ -42,7 +42,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/gnome-mac/airootfs.any/root/optimize_for_tarball.sh b/channels/gnome-mac/airootfs.any/root/optimize_for_tarball.sh
@@ -40,7 +40,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 remove /boot/archiso.img
 
diff --git a/channels/gnome-mac/airootfs.any/usr/share/calamares/final-process b/channels/gnome-mac/airootfs.any/usr/share/calamares/final-process
@@ -42,7 +42,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/gnome/airootfs.any/root/optimize_for_tarball.sh b/channels/gnome/airootfs.any/root/optimize_for_tarball.sh
@@ -41,7 +41,7 @@ remove /boot/archiso.img
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/gnome/airootfs.any/usr/share/calamares/final-process b/channels/gnome/airootfs.any/usr/share/calamares/final-process
@@ -42,7 +42,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/i3/airootfs.any/usr/share/calamares/final-process b/channels/i3/airootfs.any/usr/share/calamares/final-process
@@ -42,7 +42,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/lxde-m/airootfs.any/root/optimize_for_tarball.sh b/channels/lxde-m/airootfs.any/root/optimize_for_tarball.sh
@@ -42,7 +42,7 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/lxde-m/airootfs.any/usr/share/calamares/final-process b/channels/lxde-m/airootfs.any/usr/share/calamares/final-process
@@ -42,7 +42,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/lxde/airootfs.any/root/optimize_for_tarball.sh b/channels/lxde/airootfs.any/root/optimize_for_tarball.sh
@@ -42,7 +42,7 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/lxde/airootfs.any/usr/share/calamares/final-process b/channels/lxde/airootfs.any/usr/share/calamares/final-process
@@ -42,7 +42,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/plasma/airootfs.any/root/optimize_for_tarball.sh b/channels/plasma/airootfs.any/root/optimize_for_tarball.sh
@@ -42,5 +42,5 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
diff --git a/channels/serene/airootfs.any/root/optimize_for_tarball.sh b/channels/serene/airootfs.any/root/optimize_for_tarball.sh
@@ -42,7 +42,7 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/serene/airootfs.any/usr/share/calamares/final-process b/channels/serene/airootfs.any/usr/share/calamares/final-process
@@ -42,7 +42,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/share/airootfs.any/etc/udev/rules.d/81-dhcpcd.rules b/channels/share/airootfs.any/etc/udev/rules.d/81-dhcpcd.rules
diff --git a/channels/share/airootfs.any/root/customize_airootfs.sh b/channels/share/airootfs.any/root/customize_airootfs.sh
@@ -282,20 +282,35 @@ sed -i -r  "s/(GRUB_DISTRIBUTOR=).*/\1\"${grub_os_name}\"/g" "/etc/default/grub"
 run_additional_command "gtk-update-icon-cache" "gtk-update-icon-cache -f /usr/share/icons/hicolor"
 
 
+# systemctl helper
+# Execute the subcommand only when the specified unit is available.
+# Usage: _systemd_service <systemctl subcommand> <service1> <service2> ...
+_systemd_service(){
+    local _service
+    local _command="${1}"
+    shift 1
+    for _service in "${@}"; do
+        #if [[ -f "$(systemctl cat "${_service}" 2> "/dev/null" | head -n 1 | tail | sed 's|# ||g')" ]]; then
+        if systemctl cat "${_service}" 1>&2 2>/dev/null; then
+            systemctl ${_command} "${_service}"
+        fi
+    done
+}
+
 # Enable graphical.
-systemctl set-default graphical.target
+_systemd_service set-default graphical.target
 
 
 # Enable services.
-systemctl enable pacman-init.service
-systemctl enable org.cups.cupsd.service
-systemctl enable NetworkManager.service
-systemctl enable alteriso-reflector.service
-systemctl disable reflector.service
+_systemd_service enable pacman-init.service
+_systemd_service enable cups.service
+_systemd_service enable NetworkManager.service
+_systemd_service enable alteriso-reflector.service
+_systemd_service disable reflector.service
 
 
 # TLP
 # See ArchWiki for details.
-systemctl enable tlp.service
-systemctl mask systemd-rfkill.service
-systemctl mask systemd-rfkill.socket
+_systemd_service enable tlp.service
+_systemd_service mask systemd-rfkill.service
+_systemd_service mask systemd-rfkill.socket
diff --git a/channels/share/airootfs.any/root/optimize_for_tarball.sh b/channels/share/airootfs.any/root/optimize_for_tarball.sh
@@ -41,7 +41,7 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
 
 remove /boot/archiso.img
diff --git a/channels/share/airootfs.any/usr/share/calamares/final-process b/channels/share/airootfs.any/usr/share/calamares/final-process
@@ -42,6 +42,6 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/getty@tty1.service.d
 remove /etc/systemd/system/alteriso-reflector.service
diff --git a/channels/share/packages.i486/internet.i486 b/channels/share/packages.i486/internet.i486
@@ -16,7 +16,6 @@ irssi
 
 #-- connection --#
 dhclient
-dhcpcd
 dnsutils
 ndisc6
 networkmanager
diff --git a/channels/share/packages.i686/internet.i686 b/channels/share/packages.i686/internet.i686
@@ -16,7 +16,6 @@ irssi
 
 #-- connection --#
 dhclient
-dhcpcd
 dnsutils
 ndisc6
 networkmanager
diff --git a/channels/share/packages.x86_64/internet.x86_64 b/channels/share/packages.x86_64/internet.x86_64
@@ -16,7 +16,6 @@ irssi
 
 #-- connection --#
 dhclient
-dhcpcd
 dnsutils
 ndisc6
 networkmanager
diff --git a/channels/xfce-pro/airootfs.any/root/optimize_for_tarball.sh b/channels/xfce-pro/airootfs.any/root/optimize_for_tarball.sh
@@ -42,7 +42,7 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/xfce-pro/airootfs.any/usr/share/calamares/final-process b/channels/xfce-pro/airootfs.any/usr/share/calamares/final-process
@@ -41,7 +41,7 @@ if [[ -f /etc/systemd/journald.conf ]]; then
     sed -i 's / Storage = volatile /＃Storage = auto /' /etc/systemd/journald.conf
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/xfce/airootfs.any/etc/pacman.conf b/channels/xfce/airootfs.any/etc/pacman.conf
diff --git a/channels/xfce/airootfs.any/root/optimize_for_tarball.sh b/channels/xfce/airootfs.any/root/optimize_for_tarball.sh
@@ -42,7 +42,7 @@ if [[ -f "/etc/systemd/journald.conf" ]]; then
     sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
 fi
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
 
 # Disabled auto login
diff --git a/channels/xfce/airootfs.any/usr/share/calamares/final-process b/channels/xfce/airootfs.any/usr/share/calamares/final-process
@@ -42,7 +42,7 @@ remove /etc/initcpio
 remove /etc/systemd/journald.conf.d/volatile-storage.conf
 remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
-remove /etc/udev/rules.d/81-dhcpcd.rules
+
 remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
