artix-live: add option to configure calamares with a unpack=yes/no kernel parameter

bin/artix-live.in

@@ -3,7 +3,7 @@
 LIBDIR='@libdir@'
 DATADIR='@datadir@'
 SYSCONFDIR='@sysconfdir@'
-LOGFILE='/var/log/cromnix-live.log'
+LOGFILE='/var/log/artix-live.log'
 
 export LC_MESSAGES=C
 export LANG=C
@@ -41,9 +41,9 @@ livetimer=$(get_timer_ms)
 configure_sudoers_d
 echo "Configured sudoers: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
-configure_machine_id
-echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
+# livetimer=$(get_timer_ms)
+# configure_machine_id
+# echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
 livetimer=$(get_timer_ms)
 configure_accountsservice "${username}"
@@ -53,6 +53,10 @@ livetimer=$(get_timer_ms)
 configure_displaymanager
 echo "Configured displaymanager: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
+livetimer=$(get_timer_ms)
+configure_calamares
+echo "Configured calamares unpack ${unpack} $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
+
 livetimer=$(get_timer_ms)
 configure_user_root /
 echo "Configured root user: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"

data/live.conf

@@ -3,21 +3,15 @@
 # autologin
 autologin=true
 
-# login shell
-login_shell=/bin/bash
-
 # live username
-username=cromnix
+username=artix
 
 # live password
-password=cromnix
+password=artix
 
 # live group membership
 addgroups='video,power,disk,storage,optical,network,lp,scanner,wheel'
 
-# iso name
-iso_name=cromnix
-
 # default_desktop_file
 default_desktop_file=lxqt
 

data/rc/pacman-init.in

@@ -12,6 +12,6 @@ depend() {
 start() {
 	ebegin "Running pacman initialization"
 	/usr/bin/pacman-key --init &> /dev/null
-	/usr/bin/pacman-key --populate archlinux cromnix &> /dev/null
+	/usr/bin/pacman-key --populate archlinux artix &> /dev/null
 	eend $?
 }

lib/util-live.sh

@@ -33,6 +33,10 @@ get_tz(){
 	echo $(kernel_cmdline tz)
 }
 
+get_cal_mode(){
+	echo $(kernel_cmdline unpack)
+}
+
 get_timer_ms(){
 	echo $(date +%s%3N)
 }
@@ -58,8 +62,6 @@ load_live_config(){
 
 	[[ -z ${addgroups} ]] && addgroups=""
 
-	[[ -z ${login_shell} ]] && login_shell="/bin/bash"
-
 	echo "Loaded ${live_conf}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
 	return 0
@@ -175,9 +177,9 @@ gen_pw(){
 configure_user(){
 	# set up user and password
 	if [[ -n ${password} ]];then
-		useradd -m -G ${addgroups} -p $(gen_pw) -s ${login_shell} ${username}
+		useradd -m -G ${addgroups} -p $(gen_pw) -s /bin/bash ${username}
 	else
-		useradd -m -G ${addgroups} -s ${login_shell} ${username}
+		useradd -m -G ${addgroups} -s /bin/bash ${username}
 	fi
 }
 
@@ -271,16 +273,30 @@ configure_language(){
     echo "Configured timezone: ${timezone}" >> "${LOGFILE}"
 }
 
-configure_machine_id(){
-	if [ -e "/etc/machine-id" ] ; then
-		# delete existing machine-id
-		echo "Deleting existing machine-id ..." >> "${LOGFILE}"
-		rm /etc/machine-id
+write_unpack_conf(){
+    local conf="/etc/calamares/modules/unpackfs.conf"
+    echo "---" > "$conf"
+    echo "unpack:" >> "$conf"
+    echo "    - source: \"/run/miso/bootmnt/artix/$(uname -m)/rootfs.sfs\"" >> "$conf"
+    echo "      sourcefs: \"squashfs\"" >> "$conf"
+    echo "      destination: \"\"" >> "$conf"
+    echo "    - source: \"/run/miso/bootmnt/artix/$(uname -m)/desktopfs.sfs\"" >> "$conf"
+    echo "      sourcefs: \"squashfs\"" >> "$conf"
+    echo "      destination: \"\"" >> "$conf"
+}
+
+configure_calamares(){
+    if [[ -f /usr/bin/calamares ]];then
+        unpack=$(get_cal_mode)
+        if [[ "${unpack}" == 'yes' ]];then
+            sed -e "/- netinstall/d" \
+                -e "s|- chrootcfg|- unpackfs|" -i /etc/calamares/settings.conf
+
+            sed -e '$ d' -i /etc/calamares/modules/welcome.conf
+
+            write_unpack_conf
+        fi
     fi
-	# set unique machine-id
-	echo "Setting machine-id ..." >> "${LOGFILE}"
-	dbus-uuidgen --ensure=/etc/machine-id
-	ln -sf /etc/machine-id /var/lib/dbus/machine-id
 }
 
 configure_sudoers_d(){