[update] : Support installation directory replacement

diff --git a/build.sh b/build.sh
index 82a343f..af77bc8 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -335,6 +335,7 @@ make_customize_airootfs() {
     # -p <password> : Set password.
     # -b            : Enable boot splash.
     # -t            : Set plymouth theme.
+    # -i <inst_dir> : Set install dir
     # -j            : Enable Japanese.
     # -k <kernel>   : Set kernel name.
     # -o <os name>  : Set os name.
@@ -364,7 +365,7 @@ make_customize_airootfs() {
         addition_options="${addition_options} -r"
     fi
 
-    share_options="-p '${password}' -k '${kernel}' -u '${username}' -o '${os_name}'"
+    share_options="-p '${password}' -k '${kernel}' -u '${username}' -o '${os_name}' -i '${install_dir}'"
 
 
     # X permission

diff --git a/channels/share/airootfs/root/customize_airootfs.sh b/channels/share/airootfs/root/customize_airootfs.sh
index ce69c05..591cf2c 100755 (executable)
--- a/channels/share/airootfs/root/customize_airootfs.sh
+++ b/channels/share/airootfs/root/customize_airootfs.sh
@@ -23,7 +23,7 @@ os_name="Alter Linux"
 
 
 # Parse arguments
-while getopts 'p:bt:k:rxju:o:' arg; do
+while getopts 'p:bt:k:rxju:o:i:' arg; do
     case "${arg}" in
         p) password="${OPTARG}" ;;
         b) boot_splash=true ;;
@@ -33,6 +33,7 @@ while getopts 'p:bt:k:rxju:o:' arg; do
         j) japanese=true;;
         u) username="${OPTARG}" ;;
         o) os_name="${OPTARG}" ;;
+        i) install_dir="${OPTARG}" ;;
         x) set -xv ;;
     esac
 done
@@ -200,7 +201,9 @@ fi
 remove /usr/share/calamares/modules/initcpio/
 remove /usr/share/calamares/modules/unpackfs/
 # Set up calamares removeuser
-sed -i s/%USERNAME%/${username}/ /usr/share/calamares/modules/removeuser.conf
+sed -i s/%USERNAME%/${username}/g /usr/share/calamares/modules/removeuser.conf
+# Set INSTALL_DIR
+sed -i s/%INSTALL_DIR%/"${install_dir}"/g /usr/share/calamares/modules/unpackfs.conf
 
 
 # Set os name

diff --git a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-ck.conf b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-ck.conf
index 6c4a499..7facc58 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-ck.conf
+++ b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-ck.conf
@@ -89,9 +89,9 @@
 #        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
 
 unpack:
-    -   source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux-ck"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-ck"
         sourcefs: "file"
         destination: "/boot/vmlinuz-linux-ck"

diff --git a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-core.conf b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-core.conf
index ed0df21..34854d0 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-core.conf
+++ b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-core.conf
@@ -89,9 +89,9 @@
 #        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
 
 unpack:
-    -   source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux"
         sourcefs: "file"
         destination: "/boot/vmlinuz-linux"

diff --git a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-lqx.conf b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-lqx.conf
index 4139c04..b2c7930 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-lqx.conf
+++ b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-lqx.conf
@@ -89,9 +89,9 @@
 #        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
 
 unpack:
-    -   source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux-lqx"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lqx"
         sourcefs: "file"
         destination: "/boot/vmlinuz-linux-lqx"

diff --git a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-lts.conf b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-lts.conf
index 5fe687a..88f4e35 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-lts.conf
+++ b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-lts.conf
@@ -89,9 +89,9 @@
 #        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
 
 unpack:
-    -   source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux-lts"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts"
         sourcefs: "file"
         destination: "/boot/vmlinuz-linux-lts"

diff --git a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-rt-lts.conf b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-rt-lts.conf
index 5fe687a..88f4e35 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-rt-lts.conf
+++ b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-rt-lts.conf
@@ -89,9 +89,9 @@
 #        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
 
 unpack:
-    -   source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux-lts"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts"
         sourcefs: "file"
         destination: "/boot/vmlinuz-linux-lts"

diff --git a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-rt.conf b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-rt.conf
index e3b6fd7..45ec284 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-rt.conf
+++ b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-rt.conf
@@ -89,9 +89,9 @@
 #        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
 
 unpack:
-    -   source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux-rt"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-rt"
         sourcefs: "file"
         destination: "/boot/vmlinuz-linux-rt"

diff --git a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-xanmod-lts.conf b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-xanmod-lts.conf
index ec33792..3d15999 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-xanmod-lts.conf
+++ b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-xanmod-lts.conf
@@ -89,9 +89,9 @@
 #        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
 
 unpack:
-    -   source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux-xanmod-lts"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-xanmod-lts"
         sourcefs: "file"
         destination: "/boot/vmlinuz-linux-xanmod-lts"

diff --git a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-xanmod.conf b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-xanmod.conf
index 88b4309..c851471 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-xanmod.conf
+++ b/channels/share/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-xanmod.conf
@@ -89,9 +89,9 @@
 #        # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
 
 unpack:
-    -   source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/x86_64/airootfs.sfs"
         sourcefs: "squashfs"
         destination: ""
-    -   source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux-xanmod"
+    -   source: "/run/archiso/bootmnt/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-xanmod"
         sourcefs: "file"
         destination: "/boot/vmlinuz-linux-xanmod"