new-features

arch-install

@@ -259,11 +259,11 @@ function installation {
                 echo "It is a copytoram system."
                 unsquashfs -f -d ${mountpoint} /run/archiso/copytoram/airootfs.sfs
             else
-                read -p "Where is the airootfs.sfs? Please specify the complete path or choose the online installation? [/airootfs.sfs/online] : " installationfehler
-                if [ "${installationfehler}" == "online" ]; then
+                read -p "Where is the airootfs.sfs? Please specify the complete path or choose the online installation? [/airootfs.sfs/online] : " installationsfehler
+                if [ "${installationsfehler}" == "online" ]; then
                     minimalinstallation
                 else
-                    unsquashfs -f -d ${mountpoint} ${installationfehler}
+                    unsquashfs -f -d ${mountpoint} ${installationsfehler}
                 fi
             fi
         else
@@ -1106,14 +1106,14 @@ fi
 
 # benutzerwechsel
 
-if [ "${name}" != "noinstall" ]; then
+if [ "${name}" != "noinstall" ] && [ -z "${installationsfehler}" ]; then
     #arch-chroot ${mountpoint} usermod -l "${name}" user1
     #arch-chroot ${mountpoint} usermod -d /home/"${name}" -m "${name}"
     arch-chroot ${mountpoint} chfn -f "${name}" user1
     arch-chroot ${mountpoint} passwd user1
 fi
 
-if [ "${update}" != "n" ] && [ "${offline}" == "n" ] || [ "${installationfehler}" == "online" ]; then
+if [ "${update}" != "n" ] && [ "${offline}" == "n" ] || [ -n "${installationsfehler}" ]; then
     read -p "Should the extended installation be carried out? [Y/n] " graphical
     if [ "$graphical" != "n" ]
     then

make_mksquashfs-auto.sh

@@ -22,7 +22,7 @@ echo "Hallo Echo"
 
 # for-schleife
 for wort in "$2" "$3" "$4" "$5" "$6" "$7"
-  do
+do
     echo "$wort"
     if [ "$wort" == "deletework" ]; then deletework=y; fi
     if [ "$wort" == "filesystem" ]; then filesystem=y; fi
@@ -30,6 +30,7 @@ for wort in "$2" "$3" "$4" "$5" "$6" "$7"
     if [ "$wort" == "makebios" ]; then makebios=y; fi
     if [ "$wort" == "makeimage" ]; then makeimage=y; fi
     if [ "$wort" == "makeiso" ]; then makeiso=y; fi
+    if [ "$wort" == "mkinitcpio" ]; then mkinitcpio=y; fi
 done
 
 sleep 5
@@ -112,6 +113,7 @@ function filesystem() {
 
         fi
 
+        if [ "${mkinitcpio}" == "y" ]; then
             # module and hooks
             if [ "${version}" == "libre" ]; then
                 echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
@@ -142,6 +144,7 @@ function filesystem() {
             cp -v hooks/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks/
 
         fi
+    fi
 
 
 
@@ -439,19 +442,19 @@ if [ "${makeimage}" == "y" ]; then
 fi
 
 if [ "${makebios}" == "y" ]; then
-# BIOS
+    # BIOS
 
-BIOS
+    BIOS
 
-# EFI
+    # EFI
 
-UEFI
+    UEFI
 fi
 
 if [ "${makeiso}" == "y" ]; then
-# MAKEISO
+    # MAKEISO
 
-makeiso
+    makeiso
 fi
 
 # chroot