Merge branch 'noply' of github.com:manjaro/manjaro-tools

bin/buildiso.in

@@ -26,7 +26,6 @@ show_profile(){
         msg2 "autologin: %s" "${autologin}"
         msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
         msg2 "pxe_boot: %s" "${pxe_boot}"
-        msg2 "plymouth_boot: %s" "${plymouth_boot}"
 
         [[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
 

bin/check-yaml.in

@@ -27,7 +27,6 @@ show_profile(){
     msg2 "autologin: %s" "${autologin}"
     msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
     msg2 "pxe_boot: %s" "${pxe_boot}"
-    msg2 "plymouth_boot: %s" "${plymouth_boot}"
 
     [[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
 

data/profile.conf.example

@@ -26,9 +26,6 @@
 # nonfree xorg drivers
 # nonfree_mhwd="true"
 
-# use plymouth
-# plymouth_boot="true"
-
 # possible values: grub;systemd-boot
 # efi_boot_loader="grub"
 

lib/util-iso-boot.sh

@@ -15,31 +15,17 @@ set_mkinicpio_hooks(){
         sed -e 's/miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs //' \
         -e 's/memdisk //' -i $1
     fi
-    if ! ${plymouth_boot};then
-        msg2 "Removing plymouth hook"
-        sed -e 's/plymouth //' -i $1
-    fi
     if ! ${use_overlayfs};then
         msg2 "Setting aufs hook"
         sed -e 's/miso /miso_aufs /' -i $1
     fi
 }
 
-gen_boot_args(){
-    local args=(quiet)
-    local args=()
-    if ${plymouth_boot};then
-        args+=(splash)
-    fi
-    echo ${args[@]}
-}
-
 prepare_initcpio(){
     msg2 "Copying initcpio ..."
     cp /etc/initcpio/hooks/miso* $1/etc/initcpio/hooks
     cp /etc/initcpio/install/miso* $1/etc/initcpio/install
     cp /etc/initcpio/miso_shutdown $1/etc/initcpio
-#     sed -e "s|/usr/lib/initcpio/|/etc/initcpio/|" -i $1/etc/initcpio/install/miso_shutdown
 }
 
 prepare_initramfs(){
@@ -87,7 +73,7 @@ vars_to_boot_conf(){
         -e "s|@ARCH@|${target_arch}|g" \
         -e "s|@DRV@|$2|g" \
         -e "s|@SWITCH@|$3|g" \
-        -e "s|@BOOT_ARGS@|$(gen_boot_args)|g" \
+        -e "s|@BOOT_ARGS@||g" \
         -i $1
 }
 

lib/util.sh

@@ -379,9 +379,6 @@ check_profile_vars(){
     if ! is_valid_bool "${nonfree_mhwd}";then
         die "nonfree_mhwd only accepts true/false value!"
     fi
-    if ! is_valid_bool "${plymouth_boot}";then
-        die "plymouth_boot only accepts true/false value!"
-    fi
     if ! is_valid_bool "${pxe_boot}";then
         die "pxe_boot only accepts true/false value!"
     fi
@@ -396,12 +393,6 @@ check_profile_vars(){
     fi
 }
 
-get_svc(){
-    local service=${displaymanager}
-    ${plymouth_boot} && service="$service-plymouth"
-    echo $service
-}
-
 load_profile_config(){
 
     [[ -f $1 ]] || return 1
@@ -419,8 +410,6 @@ load_profile_config(){
 
     [[ -z ${pxe_boot} ]] && pxe_boot="true"
 
-    [[ -z ${plymouth_boot} ]] && plymouth_boot="true"
-
     [[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
 
     [[ -z ${efi_boot_loader} ]] && efi_boot_loader="grub"
@@ -459,7 +448,7 @@ load_profile_config(){
 
     if [[ ${displaymanager} != "none" ]]; then
         enable_openrc+=('xdm')
-        enable_systemd+=("$(get_svc)")
+        enable_systemd+=("${displaymanager}")
     fi
 
     [[ -z ${netinstall} ]] && netinstall='false'
@@ -514,7 +503,6 @@ reset_profile(){
     unset chrootcfg
     unset netgroups
     unset geoip
-    unset plymouth_boot
     unset basic
     unset extra
 }