3 Commits
0.3.1 ... 0.4.2

Author SHA1 Message Date
udeved
c48893ded2 artix-live: add option to configure calamares with a unpack=yes/no kernel parameter 2017-12-14 20:28:10 +01:00
udeved
781f6de35a rm machine-id config 2017-10-02 09:24:47 +02:00
udeved
6131156806 reactivate machine-id config 2017-10-01 21:59:18 +02:00
2 changed files with 33 additions and 11 deletions

View File

@@ -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}"

View File

@@ -33,6 +33,10 @@ get_tz(){
echo $(kernel_cmdline tz)
}
get_cal_mode(){
echo $(kernel_cmdline unpack)
}
get_timer_ms(){
echo $(date +%s%3N)
}
@@ -269,17 +273,31 @@ 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
# 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
# }
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
}
configure_sudoers_d(){
echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/g_wheel