forked from mirrored-repos/manjaro-tools
move and clean up code;
prepare for merge in master
This commit is contained in:
udeved
parent
fc7b5366e5
commit
7c18b51a88
4 changed files with 365 additions and 409 deletions
|
|
@ -19,7 +19,7 @@ SYSCONFDIR='@sysconfdir@'
|
||||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||||
[[ -r ${LIBDIR}/util.sh ]] && source ${LIBDIR}/util.sh
|
[[ -r ${LIBDIR}/util.sh ]] && source ${LIBDIR}/util.sh
|
||||||
[[ -r ${LIBDIR}/util-iso.sh ]] && source ${LIBDIR}/util-iso.sh
|
[[ -r ${LIBDIR}/util-iso.sh ]] && source ${LIBDIR}/util-iso.sh
|
||||||
[[ -r ${LIBDIR}/util-livecd.sh ]] && source ${LIBDIR}/util-livecd.sh
|
# [[ -r ${LIBDIR}/util-livecd.sh ]] && source ${LIBDIR}/util-livecd.sh
|
||||||
# [[ -r ${LIBDIR}/util-mount.sh ]] && source ${LIBDIR}/util-mount.sh
|
# [[ -r ${LIBDIR}/util-mount.sh ]] && source ${LIBDIR}/util-mount.sh
|
||||||
|
|
||||||
display_settings(){
|
display_settings(){
|
||||||
|
|
|
||||||
360
lib/util-iso.sh
360
lib/util-iso.sh
|
|
@ -9,6 +9,366 @@
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
gen_pw(){
|
||||||
|
echo $(perl -e 'print crypt($ARGV[0], "password")' ${password})
|
||||||
|
}
|
||||||
|
|
||||||
|
# $1: chroot
|
||||||
|
configure_machine_id(){
|
||||||
|
# set unique machine-id
|
||||||
|
msg2 "Setting machine-id ..."
|
||||||
|
chroot-run $1 dbus-uuidgen --ensure=/etc/machine-id
|
||||||
|
}
|
||||||
|
|
||||||
|
# $1: chroot
|
||||||
|
configure_user(){
|
||||||
|
# set up user and password
|
||||||
|
local pass=$(gen_pw)
|
||||||
|
msg2 "Creating user ${username} with password ${password} ..."
|
||||||
|
chroot-run $1 useradd -m -g users -G ${addgroups} -p ${pass} ${username}
|
||||||
|
}
|
||||||
|
|
||||||
|
# $1: chroot
|
||||||
|
configure_user_root(){
|
||||||
|
# set up root password
|
||||||
|
msg2 "Setting root password ${password} ..."
|
||||||
|
chroot-run $1 echo "root:$(gen_pw)" | chpasswd
|
||||||
|
}
|
||||||
|
|
||||||
|
# $1: chroot
|
||||||
|
configure_hostname(){
|
||||||
|
msg2 "Setting hostname ${hostname} ..."
|
||||||
|
if [[ -f $1/usr/bin/openrc ]];then
|
||||||
|
local _hostname='hostname="'${hostname}'"'
|
||||||
|
sed -i -e "s|^.*hostname=.*|${_hostname}|" $1/etc/conf.d/hostname
|
||||||
|
else
|
||||||
|
echo ${hostname} > $1/etc/hostname
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# $1: chroot
|
||||||
|
configure_plymouth(){
|
||||||
|
if [ -e $1/etc/plymouth/plymouthd.conf ] ; then
|
||||||
|
sed -i -e "s/^.*Theme=.*/Theme=$plymouth_theme/" $1/etc/plymouth/plymouthd.conf
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
configure_services(){
|
||||||
|
if [[ -f ${work_dir}/root-image/usr/bin/openrc ]];then
|
||||||
|
msg2 "Congiguring OpenRC ...."
|
||||||
|
for svc in ${startservices_openrc[@]}; do
|
||||||
|
if [[ -f $1/etc/init.d/$svc ]]; then
|
||||||
|
msg2 "Setting $svc ..."
|
||||||
|
[[ ! -d $1/etc/runlevels/default ]] && mkdir -p $1/etc/runlevels/default
|
||||||
|
ln -sf /etc/init.d/$svc $1/etc/runlevels/default/$svc
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
else
|
||||||
|
msg2 "Congiguring SystemD ...."
|
||||||
|
for svc in ${startservices_systemd[@]}; do
|
||||||
|
msg2 "Setting $svc ..."
|
||||||
|
if [[ -f $1/usr/lib/systemd/system/$svc ]];then
|
||||||
|
msg2 "Setting $svc ..."
|
||||||
|
chroot-run $1 systemctl enable $svc
|
||||||
|
fi
|
||||||
|
# if [[ -f $1/etc/systemd/system/$svc ]];then
|
||||||
|
# msg2 "Setting $svc ..."
|
||||||
|
# chroot-run $1 systemctl enable $svc
|
||||||
|
# fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# $1: chroot
|
||||||
|
configure_displaymanager(){
|
||||||
|
|
||||||
|
_displaymanager=''
|
||||||
|
|
||||||
|
# do_setuplightdm
|
||||||
|
msg2 "Configuring Displaymanager ..."
|
||||||
|
if [ -e "$1/usr/bin/lightdm" ] ; then
|
||||||
|
|
||||||
|
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
||||||
|
sed -i -e 's/^.*user-session=.*/user-session=xfce/' $1/etc/lightdm/lightdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
||||||
|
sed -i -e 's/^.*user-session=.*/user-session=cinnamon/' $1/etc/lightdm/lightdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/mate-session" ] ; then
|
||||||
|
sed -i -e 's/^.*user-session=.*/user-session=mate/' $1/etc/lightdm/lightdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
||||||
|
sed -i -e 's/^.*user-session=.*/user-session=enlightenment/' $1/etc/lightdm/lightdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
||||||
|
sed -i -e 's/^.*user-session=.*/user-session=openbox/' $1/etc/lightdm/lightdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/startlxde" ] ; then
|
||||||
|
sed -i -e 's/^.*user-session=.*/user-session=LXDE/' $1/etc/lightdm/lightdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
||||||
|
sed -i -e 's/^.*user-session=.*/user-session=lxqt/' $1/etc/lightdm/lightdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/pekwm" ] ; then
|
||||||
|
sed -i -e 's/^.*user-session=.*/user-session=pekwm/' $1/etc/lightdm/lightdm.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$1" != "${work_dir}/${desktop}-image" ]]; then
|
||||||
|
|
||||||
|
sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" $1/etc/lightdm/lightdm.conf
|
||||||
|
sed -i -e 's/^.*autologin-user-timeout=.*/autologin-user-timeout=0/' $1/etc/lightdm/lightdm.conf
|
||||||
|
#sed -i -e 's/^.*autologin-in-background=.*/autologin-in-background=true/' /etc/lightdm/lightdm.conf
|
||||||
|
|
||||||
|
chroot-run $1 gpasswd -a ${username} autologin &> /dev/null
|
||||||
|
chroot-run $1 groupadd autologin
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
_displaymanager='lightdm'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# do_setupkdm
|
||||||
|
if [ -e "$1/usr/share/config/kdm/kdmrc" ] ; then
|
||||||
|
|
||||||
|
chroot-run $1 xdg-icon-resource forceupdate --theme hicolor &> /dev/null
|
||||||
|
if [ -e "$1/usr/bin/update-desktop-database" ] ; then
|
||||||
|
chroot-run $1 update-desktop-database -q
|
||||||
|
fi
|
||||||
|
sed -i -e "s/^.*AutoLoginUser=.*/AutoLoginUser=${username}/" $1/usr/share/config/kdm/kdmrc
|
||||||
|
sed -i -e "s/^.*AutoLoginPass=.*/AutoLoginPass=${username}/" $1/usr/share/config/kdm/kdmrc
|
||||||
|
|
||||||
|
_displaymanager='kdm'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# do_setupgdm
|
||||||
|
if [ -e "$1/usr/bin/gdm" ] ; then
|
||||||
|
|
||||||
|
if [ -d "$1/var/lib/AccountsService/users" ] ; then
|
||||||
|
echo "[User]" > $1/var/lib/AccountsService/users/gdm
|
||||||
|
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
||||||
|
echo "XSession=xfce" >> $1/var/lib/AccountsService/users/gdm
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
||||||
|
echo "XSession=cinnamon" >> $1/var/lib/AccountsService/users/gdm
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/mate-session" ] ; then
|
||||||
|
echo "XSession=mate" >> $1/var/lib/AccountsService/users/gdm
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
||||||
|
echo "XSession=enlightenment" >> $1/var/lib/AccountsService/users/gdm
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
||||||
|
echo "XSession=openbox" >> $1/var/lib/AccountsService/users/gdm
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/startlxde" ] ; then
|
||||||
|
echo "XSession=LXDE" >> $1/var/lib/AccountsService/users/gdm
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
||||||
|
echo "XSession=LXQt" >> $1/var/lib/AccountsService/users/gdm
|
||||||
|
fi
|
||||||
|
echo "Icon=" >> $1/var/lib/AccountsService/users/gdm
|
||||||
|
fi
|
||||||
|
_displaymanager='gdm'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# do_setupmdm
|
||||||
|
if [ -e "$1/usr/bin/mdm" ] ; then
|
||||||
|
|
||||||
|
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
||||||
|
sed -i 's|default.desktop|xfce.desktop|g' $1/etc/mdm/custom.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
||||||
|
sed -i 's|default.desktop|cinnamon.desktop|g' $1/etc/mdm/custom.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
||||||
|
sed -i 's|default.desktop|openbox.desktop|g' $1/etc/mdm/custom.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/mate-session" ] ; then
|
||||||
|
sed -i 's|default.desktop|mate.desktop|g' $1/etc/mdm/custom.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/startlxde" ] ; then
|
||||||
|
sed -i 's|default.desktop|LXDE.desktop|g' $1/etc/mdm/custom.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
||||||
|
sed -i 's|default.desktop|lxqt.desktop|g' $1/etc/mdm/custom.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
||||||
|
sed -i 's|default.desktop|enlightenment.desktop|g' $1/etc/mdm/custom.conf
|
||||||
|
fi
|
||||||
|
_displaymanager='mdm'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# do_setupsddm
|
||||||
|
if [ -e "$1/usr/bin/sddm" ] ; then
|
||||||
|
|
||||||
|
sed -i -e "s|^User=.*|User=${username}|" $1/etc/sddm.conf
|
||||||
|
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
||||||
|
sed -i -e 's|^Session=.*|Session=xfce.desktop|' $1/etc/sddm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
||||||
|
sed -i -e 's|^Session=.*|Session=cinnamon.desktop|' $1/etc/sddm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
||||||
|
sed -i -e 's|^Session=.*|Session=openbox.desktop|' $1/etc/sddm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/mate-session" ] ; then
|
||||||
|
sed -i -e 's|^Session=.*|Session=mate.desktop|' $1/etc/sddm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/lxsession" ] ; then
|
||||||
|
sed -i -e 's|^Session=.*|Session=LXDE.desktop|' $1/etc/sddm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
||||||
|
sed -i -e 's|^Session=.*|Session=lxqt.desktop|' $1/etc/sddm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
||||||
|
sed -i -e 's|^Session=.*|Session=enlightenment.desktop|' $1/etc/sddm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/startkde" ] ; then
|
||||||
|
sed -i -e 's|^Session=.*|Session=plasma.desktop|' $1/etc/sddm.conf
|
||||||
|
fi
|
||||||
|
_displaymanager='sddm'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# do_setuplxdm
|
||||||
|
if [ -e "$1/usr/bin/lxdm" ] ; then
|
||||||
|
|
||||||
|
sed -i -e "s/^.*autologin=.*/autologin=${username}/" $1/etc/lxdm/lxdm.conf
|
||||||
|
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
||||||
|
sed -i -e 's|^.*session=.*|session=/usr/bin/startxfce4|' $1/etc/lxdm/lxdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
||||||
|
sed -i -e 's|^.*session=.*|session=/usr/bin/cinnamon-session|' $1/etc/lxdm/lxdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/mate-session" ] ; then
|
||||||
|
sed -i -e 's|^.*session=.*|session=/usr/bin/mate-session|' $1/etc/lxdm/lxdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
||||||
|
sed -i -e 's|^.*session=.*|session=/usr/bin/enlightenment_start|' $1/etc/lxdm/lxdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
||||||
|
sed -i -e 's|^.*session=.*|session=/usr/bin/openbox-session|' $1/etc/lxdm/lxdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/startlxde" ] ; then
|
||||||
|
sed -i -e 's|^.*session=.*|session=/usr/bin/lxsession|' $1/etc/lxdm/lxdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
||||||
|
sed -i -e 's|^.*session=.*|session=/usr/bin/lxqt-session|' $1/etc/lxdm/lxdm.conf
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/pekwm" ] ; then
|
||||||
|
sed -i -e 's|^.*session=.*|session=/usr/bin/pekwm|' $1/etc/lxdm/lxdm.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
_displaymanager='lxdm'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -e $1/usr/bin/openrc ]];then
|
||||||
|
local _conf_xdm='DISPLAYMANAGER="'${_displaymanager}'"'
|
||||||
|
sed -i -e "s|^.*DISPLAYMANAGER=.*|${_conf_xdm}|" $1/etc/conf.d/xdm
|
||||||
|
else
|
||||||
|
chroot-run $1 systemctl enable ${_displaymanager}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# $1: chroot
|
||||||
|
configure_accountsservice(){
|
||||||
|
msg2 "Configuring AcooutsService ..."
|
||||||
|
if [ -d "$1/var/lib/AccountsService/users" ] ; then
|
||||||
|
echo "[User]" > $1/var/lib/AccountsService/users/${username}
|
||||||
|
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
||||||
|
echo "XSession=xfce" >> $1/var/lib/AccountsService/users/${username}
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
||||||
|
echo "XSession=cinnamon" >> $1/var/lib/AccountsService/users/${username}
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/mate-session" ] ; then
|
||||||
|
echo "XSession=mate" >> $1/var/lib/AccountsService/users/${username}
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
||||||
|
echo "XSession=enlightenment" >> $1/var/lib/AccountsService/users/${username}
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
||||||
|
echo "XSession=openbox" >> $1/var/lib/AccountsService/users/${username}
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/startlxde" ] ; then
|
||||||
|
echo "XSession=LXDE" >> $1/var/lib/AccountsService/users/${username}
|
||||||
|
fi
|
||||||
|
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
||||||
|
echo "XSession=LXQt" >> $1/var/lib/AccountsService/users/${username}
|
||||||
|
fi
|
||||||
|
echo "Icon=/var/lib/AccountsService/icons/${username}.png" >> $1/var/lib/AccountsService/users/${username}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
write_calamares_dm_conf(){
|
||||||
|
# write the conf to overlay-image/etc/calamares ?
|
||||||
|
local DISPLAYMANAGER="$1/etc/calamares/modules/displaymanager.conf"
|
||||||
|
|
||||||
|
echo "displaymanagers:" > "$DISPLAYMANAGER"
|
||||||
|
echo " - ${_displaymanager}" >> "$DISPLAYMANAGER"
|
||||||
|
echo '' >> "$DISPLAYMANAGER"
|
||||||
|
echo '#executable: "startkde"' >> "$DISPLAYMANAGER"
|
||||||
|
echo '#desktopFile: "plasma"' >> "$DISPLAYMANAGER"
|
||||||
|
echo '' >> "$DISPLAYMANAGER"
|
||||||
|
echo "basicSetup: false" >> "$DISPLAYMANAGER"
|
||||||
|
}
|
||||||
|
|
||||||
|
# $1: chroot
|
||||||
|
configure_calamares(){
|
||||||
|
if [[ -f $1/usr/bin/calamares ]];then
|
||||||
|
msg2 "Configuring Calamares ..."
|
||||||
|
mkdir -p $1/etc/calamares/modules
|
||||||
|
local UNPACKFS="$1/usr/share/calamares/modules/unpackfs.conf"
|
||||||
|
if [ ! -e $UNPACKFS ] ; then
|
||||||
|
echo "---" > "$UNPACKFS"
|
||||||
|
echo "unpack:" >> "$UNPACKFS"
|
||||||
|
echo " - source: \"/bootmnt/${install_dir}/${arch}/root-image.sqfs\"" >> "$UNPACKFS"
|
||||||
|
echo " sourcefs: \"squashfs\"" >> "$UNPACKFS"
|
||||||
|
echo " destination: \"\"" >> "$UNPACKFS"
|
||||||
|
echo " - source: \"/bootmnt/${install_dir}/${arch}/${desktop}-image.sqfs\"" >> "$UNPACKFS"
|
||||||
|
echo " sourcefs: \"squashfs\"" >> "$UNPACKFS"
|
||||||
|
echo " destination: \"\"" >> "$UNPACKFS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# TODO maybe add a configuration flag in manjaro-tools.conf for default displymanager
|
||||||
|
|
||||||
|
#local DISPLAYMANAGER="$1/etc/calamares/modules/displaymanager.conf"
|
||||||
|
|
||||||
|
write_calamares_dm_conf $1
|
||||||
|
|
||||||
|
|
||||||
|
# if [ ! -e $DISPLAYMANAGER ] ; then
|
||||||
|
# echo "---" > "$DISPLAYMANAGER"
|
||||||
|
# echo "displaymanagers:" >> "$DISPLAYMANAGER"
|
||||||
|
# if [ -e "${work_dir}/${desktop}-image/usr/bin/lightdm" ] ; then
|
||||||
|
# echo " - lightdm" >> "$DISPLAYMANAGER"
|
||||||
|
# fi
|
||||||
|
# if [ -e "${work_dir}/${desktop}-image/usr/share/config/kdm/kdmrc" ] ; then
|
||||||
|
# echo " - kdm" >> "$DISPLAYMANAGER"
|
||||||
|
# fi
|
||||||
|
# if [ -e "${work_dir}/${desktop}-image/usr/bin/gdm" ] ; then
|
||||||
|
# echo " - gdm" >> "$DISPLAYMANAGER"
|
||||||
|
# fi
|
||||||
|
# if [ -e "${work_dir}/${desktop}-image/usr/bin/mdm" ] ; then
|
||||||
|
# echo " - mdm" >> "$DISPLAYMANAGER"
|
||||||
|
# fi
|
||||||
|
# if [ -e "${work_dir}/${desktop}-image/usr/bin/sddm" ] ; then
|
||||||
|
# echo " - sddm" >> "$DISPLAYMANAGER"
|
||||||
|
# fi
|
||||||
|
# if [ -e "${work_dir}/${desktop}-image/usr/bin/lxdm" ] ; then
|
||||||
|
# echo " - lxdm" >> "$DISPLAYMANAGER"
|
||||||
|
# fi
|
||||||
|
# if [ -e "${work_dir}/${desktop}-image/usr/bin/slim" ] ; then
|
||||||
|
# echo " - slim" >> "$DISPLAYMANAGER"
|
||||||
|
# fi
|
||||||
|
# fi
|
||||||
|
|
||||||
|
local INITCPIO="$1/usr/share/calamares/modules/initcpio.conf"
|
||||||
|
if [ ! -e $INITCPIO ] ; then
|
||||||
|
echo "---" > "$INITCPIO"
|
||||||
|
echo "kernel: ${manjaro_kernel}" >> "$INITCPIO"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# $1: source image
|
# $1: source image
|
||||||
# $2: target image
|
# $2: target image
|
||||||
|
|
|
||||||
|
|
@ -9,13 +9,11 @@
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
################################################################
|
# this util-livecd.sh gets copied to overlay-image/opt/livecd
|
||||||
######### Borrowed from livecd; needs sorting out ##############
|
|
||||||
################################################################
|
|
||||||
|
|
||||||
# this util-livecd.sh gets copied to overlay-image
|
check_ping(){
|
||||||
|
echo $(LC_ALL=C ping -c 1 www.manjaro.org | grep "1 received")
|
||||||
# ping_check=$(LC_ALL=C ping -c 1 www.manjaro.org | grep "1 received")
|
}
|
||||||
|
|
||||||
configure_translation_pkgs_live(){
|
configure_translation_pkgs_live(){
|
||||||
# Determind which language we are using
|
# Determind which language we are using
|
||||||
|
|
@ -408,389 +406,3 @@ configure_thus_live(){
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
######################################
|
|
||||||
######### end livecd #################
|
|
||||||
######################################
|
|
||||||
|
|
||||||
gen_pw(){
|
|
||||||
echo $(perl -e 'print crypt($ARGV[0], "password")' ${password})
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
|
||||||
configure_machine_id(){
|
|
||||||
# set unique machine-id
|
|
||||||
msg2 "Setting machine-id ..."
|
|
||||||
chroot-run $1 dbus-uuidgen --ensure=/etc/machine-id
|
|
||||||
#chroot-run $1 dbus-uuidgen --ensure=/var/lib/dbus/machine-id
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
|
||||||
configure_user(){
|
|
||||||
# set up user and password
|
|
||||||
local pass=$(gen_pw)
|
|
||||||
msg2 "Creating user ${username} with password ${password} ..."
|
|
||||||
chroot-run $1 useradd -m -g users -G ${addgroups} -p ${pass} ${username}
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
|
||||||
configure_user_root(){
|
|
||||||
# set up root password
|
|
||||||
msg2 "Setting root password ${password} ..."
|
|
||||||
local _cmd=echo "$(gen_pw):root"
|
|
||||||
msg2 "Command string: $_cmd"
|
|
||||||
chroot-run $1 $_cmd | chpasswd
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
|
||||||
configure_hostname(){
|
|
||||||
msg2 "Setting hostname ${hostname} ..."
|
|
||||||
if [[ -f $1/usr/bin/openrc ]];then
|
|
||||||
local _hostname='hostname="'${hostname}'"'
|
|
||||||
sed -i -e "s|^.*hostname=.*|${_hostname}|" $1/etc/conf.d/hostname
|
|
||||||
else
|
|
||||||
echo ${hostname} > $1/etc/hostname
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
|
||||||
configure_plymouth(){
|
|
||||||
if [ -e $1/etc/plymouth/plymouthd.conf ] ; then
|
|
||||||
sed -i -e "s/^.*Theme=.*/Theme=$plymouth_theme/" $1/etc/plymouth/plymouthd.conf
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_services(){
|
|
||||||
if [[ -f ${work_dir}/root-image/usr/bin/openrc ]];then
|
|
||||||
msg2 "Congiguring OpenRC ...."
|
|
||||||
for svc in ${startservices_openrc[@]}; do
|
|
||||||
if [[ -f $1/etc/init.d/$svc ]]; then
|
|
||||||
msg2 "Setting $svc ..."
|
|
||||||
[[ ! -d $1/etc/runlevels/default ]] && mkdir -p $1/etc/runlevels/default
|
|
||||||
ln -sf /etc/init.d/$svc $1/etc/runlevels/default/$svc
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
else
|
|
||||||
msg2 "Congiguring SystemD ...."
|
|
||||||
for svc in ${startservices_systemd[@]}; do
|
|
||||||
msg2 "Setting $svc ..."
|
|
||||||
if [[ -f $1/usr/lib/systemd/system/$svc ]];then
|
|
||||||
msg2 "Setting $svc ..."
|
|
||||||
chroot-run $1 systemctl enable $svc
|
|
||||||
fi
|
|
||||||
# if [[ -f $1/etc/systemd/system/$svc ]];then
|
|
||||||
# msg2 "Setting $svc ..."
|
|
||||||
# chroot-run $1 systemctl enable $svc
|
|
||||||
# fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
fix_lightdm(){
|
|
||||||
getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
|
|
||||||
getent passwd lightdm > /dev/null 2>&1 || useradd -c 'LightDM Display Manager' -u 620 -g lightdm -d /var/run/lightdm -s /usr/bin/nologin lightdm
|
|
||||||
passwd -l lightdm > /dev/null
|
|
||||||
chown -R lightdm:lightdm /var/run/lightdm > /dev/null
|
|
||||||
mkdir -p /run/lightdm > /dev/null
|
|
||||||
mkdir -p $1/var/lib/lightdm-data
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
|
||||||
configure_displaymanager(){
|
|
||||||
_displaymanager=''
|
|
||||||
# do_setuplightdm
|
|
||||||
msg2 "Configuring Displaymanager ..."
|
|
||||||
if [ -e "$1/usr/bin/lightdm" ] ; then
|
|
||||||
|
|
||||||
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
|
||||||
sed -i -e 's/^.*user-session=.*/user-session=xfce/' $1/etc/lightdm/lightdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
|
||||||
sed -i -e 's/^.*user-session=.*/user-session=cinnamon/' $1/etc/lightdm/lightdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/mate-session" ] ; then
|
|
||||||
sed -i -e 's/^.*user-session=.*/user-session=mate/' $1/etc/lightdm/lightdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
|
||||||
sed -i -e 's/^.*user-session=.*/user-session=enlightenment/' $1/etc/lightdm/lightdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
|
||||||
sed -i -e 's/^.*user-session=.*/user-session=openbox/' $1/etc/lightdm/lightdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/startlxde" ] ; then
|
|
||||||
sed -i -e 's/^.*user-session=.*/user-session=LXDE/' $1/etc/lightdm/lightdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
|
||||||
sed -i -e 's/^.*user-session=.*/user-session=lxqt/' $1/etc/lightdm/lightdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/pekwm" ] ; then
|
|
||||||
sed -i -e 's/^.*user-session=.*/user-session=pekwm/' $1/etc/lightdm/lightdm.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if [[ $1 != "${work_dir}/${desktop}-image" ]]; then
|
|
||||||
|
|
||||||
#mkdir -p /run/lightdm > /dev/null
|
|
||||||
|
|
||||||
sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" $1/etc/lightdm/lightdm.conf
|
|
||||||
sed -i -e 's/^.*autologin-user-timeout=.*/autologin-user-timeout=0/' $1/etc/lightdm/lightdm.conf
|
|
||||||
#sed -i -e 's/^.*autologin-in-background=.*/autologin-in-background=true/' /etc/lightdm/lightdm.conf
|
|
||||||
|
|
||||||
chroot-run $1 gpasswd -a ${username} autologin &> /dev/null
|
|
||||||
chroot-run $1 groupadd autologin
|
|
||||||
|
|
||||||
# livecd fix
|
|
||||||
#mkdir -p $1/var/lib/lightdm-data
|
|
||||||
fi
|
|
||||||
#chmod +r $1/etc/lightdm/lightdm.conf
|
|
||||||
|
|
||||||
if [[ -e $1/usr/bin/systemd ]]; then
|
|
||||||
chroot-run $1 systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
|
|
||||||
chroot-run $1 systemd-tmpfiles --create --remove
|
|
||||||
fi
|
|
||||||
_displaymanager='lightdm'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# do_setupkdm
|
|
||||||
if [ -e "$1/usr/share/config/kdm/kdmrc" ] ; then
|
|
||||||
|
|
||||||
chroot-run $1 xdg-icon-resource forceupdate --theme hicolor &> /dev/null
|
|
||||||
if [ -e "$1/usr/bin/update-desktop-database" ] ; then
|
|
||||||
chroot-run $1 update-desktop-database -q
|
|
||||||
fi
|
|
||||||
sed -i -e "s/^.*AutoLoginUser=.*/AutoLoginUser=${username}/" $1/usr/share/config/kdm/kdmrc
|
|
||||||
sed -i -e "s/^.*AutoLoginPass=.*/AutoLoginPass=${username}/" $1/usr/share/config/kdm/kdmrc
|
|
||||||
|
|
||||||
_displaymanager='kdm'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# do_setupgdm
|
|
||||||
if [ -e "$1/usr/bin/gdm" ] ; then
|
|
||||||
|
|
||||||
if [ -d "$1/var/lib/AccountsService/users" ] ; then
|
|
||||||
echo "[User]" > $1/var/lib/AccountsService/users/gdm
|
|
||||||
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
|
||||||
echo "XSession=xfce" >> $1/var/lib/AccountsService/users/gdm
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
|
||||||
echo "XSession=cinnamon" >> $1/var/lib/AccountsService/users/gdm
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/mate-session" ] ; then
|
|
||||||
echo "XSession=mate" >> $1/var/lib/AccountsService/users/gdm
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
|
||||||
echo "XSession=enlightenment" >> $1/var/lib/AccountsService/users/gdm
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
|
||||||
echo "XSession=openbox" >> $1/var/lib/AccountsService/users/gdm
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/startlxde" ] ; then
|
|
||||||
echo "XSession=LXDE" >> $1/var/lib/AccountsService/users/gdm
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
|
||||||
echo "XSession=LXQt" >> $1/var/lib/AccountsService/users/gdm
|
|
||||||
fi
|
|
||||||
echo "Icon=" >> $1/var/lib/AccountsService/users/gdm
|
|
||||||
fi
|
|
||||||
_displaymanager='gdm'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# do_setupmdm
|
|
||||||
if [ -e "$1/usr/bin/mdm" ] ; then
|
|
||||||
|
|
||||||
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
|
||||||
sed -i 's|default.desktop|xfce.desktop|g' $1/etc/mdm/custom.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
|
||||||
sed -i 's|default.desktop|cinnamon.desktop|g' $1/etc/mdm/custom.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
|
||||||
sed -i 's|default.desktop|openbox.desktop|g' $1/etc/mdm/custom.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/mate-session" ] ; then
|
|
||||||
sed -i 's|default.desktop|mate.desktop|g' $1/etc/mdm/custom.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/startlxde" ] ; then
|
|
||||||
sed -i 's|default.desktop|LXDE.desktop|g' $1/etc/mdm/custom.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
|
||||||
sed -i 's|default.desktop|lxqt.desktop|g' $1/etc/mdm/custom.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
|
||||||
sed -i 's|default.desktop|enlightenment.desktop|g' $1/etc/mdm/custom.conf
|
|
||||||
fi
|
|
||||||
_displaymanager='mdm'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# do_setupsddm
|
|
||||||
if [ -e "$1/usr/bin/sddm" ] ; then
|
|
||||||
|
|
||||||
sed -i -e "s|^User=.*|User=${username}|" $1/etc/sddm.conf
|
|
||||||
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
|
||||||
sed -i -e 's|^Session=.*|Session=xfce.desktop|' $1/etc/sddm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
|
||||||
sed -i -e 's|^Session=.*|Session=cinnamon.desktop|' $1/etc/sddm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
|
||||||
sed -i -e 's|^Session=.*|Session=openbox.desktop|' $1/etc/sddm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/mate-session" ] ; then
|
|
||||||
sed -i -e 's|^Session=.*|Session=mate.desktop|' $1/etc/sddm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/lxsession" ] ; then
|
|
||||||
sed -i -e 's|^Session=.*|Session=LXDE.desktop|' $1/etc/sddm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
|
||||||
sed -i -e 's|^Session=.*|Session=lxqt.desktop|' $1/etc/sddm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
|
||||||
sed -i -e 's|^Session=.*|Session=enlightenment.desktop|' $1/etc/sddm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/startkde" ] ; then
|
|
||||||
sed -i -e 's|^Session=.*|Session=plasma.desktop|' $1/etc/sddm.conf
|
|
||||||
fi
|
|
||||||
_displaymanager='sddm'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# do_setuplxdm
|
|
||||||
if [ -e "$1/usr/bin/lxdm" ] ; then
|
|
||||||
|
|
||||||
sed -i -e "s/^.*autologin=.*/autologin=${username}/" $1/etc/lxdm/lxdm.conf
|
|
||||||
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
|
||||||
sed -i -e 's|^.*session=.*|session=/usr/bin/startxfce4|' $1/etc/lxdm/lxdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
|
||||||
sed -i -e 's|^.*session=.*|session=/usr/bin/cinnamon-session|' $1/etc/lxdm/lxdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/mate-session" ] ; then
|
|
||||||
sed -i -e 's|^.*session=.*|session=/usr/bin/mate-session|' $1/etc/lxdm/lxdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
|
||||||
sed -i -e 's|^.*session=.*|session=/usr/bin/enlightenment_start|' $1/etc/lxdm/lxdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
|
||||||
sed -i -e 's|^.*session=.*|session=/usr/bin/openbox-session|' $1/etc/lxdm/lxdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/startlxde" ] ; then
|
|
||||||
sed -i -e 's|^.*session=.*|session=/usr/bin/lxsession|' $1/etc/lxdm/lxdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
|
||||||
sed -i -e 's|^.*session=.*|session=/usr/bin/lxqt-session|' $1/etc/lxdm/lxdm.conf
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/pekwm" ] ; then
|
|
||||||
sed -i -e 's|^.*session=.*|session=/usr/bin/pekwm|' $1/etc/lxdm/lxdm.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
_displaymanager='lxdm'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -e $1/usr/bin/openrc ]];then
|
|
||||||
local _conf_xdm='DISPLAYMANAGER="'${_displaymanager}'"'
|
|
||||||
sed -i -e "s|^.*DISPLAYMANAGER=.*|${_conf_xdm}|" $1/etc/conf.d/xdm
|
|
||||||
else
|
|
||||||
chroot-run $1 systemctl enable ${_displaymanager}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
|
||||||
configure_accountsservice(){
|
|
||||||
msg2 "Configuring AcooutsService ..."
|
|
||||||
if [ -d "$1/var/lib/AccountsService/users" ] ; then
|
|
||||||
echo "[User]" > $1/var/lib/AccountsService/users/${username}
|
|
||||||
if [ -e "$1/usr/bin/startxfce4" ] ; then
|
|
||||||
echo "XSession=xfce" >> $1/var/lib/AccountsService/users/${username}
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/cinnamon-session" ] ; then
|
|
||||||
echo "XSession=cinnamon" >> $1/var/lib/AccountsService/users/${username}
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/mate-session" ] ; then
|
|
||||||
echo "XSession=mate" >> $1/var/lib/AccountsService/users/${username}
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
|
|
||||||
echo "XSession=enlightenment" >> $1/var/lib/AccountsService/users/${username}
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/openbox-session" ] ; then
|
|
||||||
echo "XSession=openbox" >> $1/var/lib/AccountsService/users/${username}
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/startlxde" ] ; then
|
|
||||||
echo "XSession=LXDE" >> $1/var/lib/AccountsService/users/${username}
|
|
||||||
fi
|
|
||||||
if [ -e "$1/usr/bin/lxqt-session" ] ; then
|
|
||||||
echo "XSession=LXQt" >> $1/var/lib/AccountsService/users/${username}
|
|
||||||
fi
|
|
||||||
echo "Icon=/var/lib/AccountsService/icons/${username}.png" >> $1/var/lib/AccountsService/users/${username}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
write_calamares_dm_conf(){
|
|
||||||
# write the conf to overlay-image/etc/calamares ?
|
|
||||||
local DISPLAYMANAGER="$1/etc/calamares/modules/displaymanager.conf"
|
|
||||||
|
|
||||||
echo "displaymanagers:" > "$DISPLAYMANAGER"
|
|
||||||
echo " - ${_displaymanager}" >> "$DISPLAYMANAGER"
|
|
||||||
echo '' >> "$DISPLAYMANAGER"
|
|
||||||
echo '#executable: "startkde"' >> "$DISPLAYMANAGER"
|
|
||||||
echo '#desktopFile: "plasma"' >> "$DISPLAYMANAGER"
|
|
||||||
echo '' >> "$DISPLAYMANAGER"
|
|
||||||
echo "basicSetup: false" >> "$DISPLAYMANAGER"
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
|
||||||
configure_calamares(){
|
|
||||||
if [[ -f $1/usr/bin/calamares ]];then
|
|
||||||
msg2 "Configuring Calamares ..."
|
|
||||||
mkdir -p $1/etc/calamares/modules
|
|
||||||
local UNPACKFS="$1/usr/share/calamares/modules/unpackfs.conf"
|
|
||||||
if [ ! -e $UNPACKFS ] ; then
|
|
||||||
echo "---" > "$UNPACKFS"
|
|
||||||
echo "unpack:" >> "$UNPACKFS"
|
|
||||||
echo " - source: \"/bootmnt/${install_dir}/${arch}/root-image.sqfs\"" >> "$UNPACKFS"
|
|
||||||
echo " sourcefs: \"squashfs\"" >> "$UNPACKFS"
|
|
||||||
echo " destination: \"\"" >> "$UNPACKFS"
|
|
||||||
echo " - source: \"/bootmnt/${install_dir}/${arch}/${desktop}-image.sqfs\"" >> "$UNPACKFS"
|
|
||||||
echo " sourcefs: \"squashfs\"" >> "$UNPACKFS"
|
|
||||||
echo " destination: \"\"" >> "$UNPACKFS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# TODO maybe add a configuration flag in manjaro-tools.conf for default displymanager
|
|
||||||
|
|
||||||
#local DISPLAYMANAGER="$1/etc/calamares/modules/displaymanager.conf"
|
|
||||||
|
|
||||||
write_calamares_dm_conf $1
|
|
||||||
|
|
||||||
|
|
||||||
# if [ ! -e $DISPLAYMANAGER ] ; then
|
|
||||||
# echo "---" > "$DISPLAYMANAGER"
|
|
||||||
# echo "displaymanagers:" >> "$DISPLAYMANAGER"
|
|
||||||
# if [ -e "${work_dir}/${desktop}-image/usr/bin/lightdm" ] ; then
|
|
||||||
# echo " - lightdm" >> "$DISPLAYMANAGER"
|
|
||||||
# fi
|
|
||||||
# if [ -e "${work_dir}/${desktop}-image/usr/share/config/kdm/kdmrc" ] ; then
|
|
||||||
# echo " - kdm" >> "$DISPLAYMANAGER"
|
|
||||||
# fi
|
|
||||||
# if [ -e "${work_dir}/${desktop}-image/usr/bin/gdm" ] ; then
|
|
||||||
# echo " - gdm" >> "$DISPLAYMANAGER"
|
|
||||||
# fi
|
|
||||||
# if [ -e "${work_dir}/${desktop}-image/usr/bin/mdm" ] ; then
|
|
||||||
# echo " - mdm" >> "$DISPLAYMANAGER"
|
|
||||||
# fi
|
|
||||||
# if [ -e "${work_dir}/${desktop}-image/usr/bin/sddm" ] ; then
|
|
||||||
# echo " - sddm" >> "$DISPLAYMANAGER"
|
|
||||||
# fi
|
|
||||||
# if [ -e "${work_dir}/${desktop}-image/usr/bin/lxdm" ] ; then
|
|
||||||
# echo " - lxdm" >> "$DISPLAYMANAGER"
|
|
||||||
# fi
|
|
||||||
# if [ -e "${work_dir}/${desktop}-image/usr/bin/slim" ] ; then
|
|
||||||
# echo " - slim" >> "$DISPLAYMANAGER"
|
|
||||||
# fi
|
|
||||||
# fi
|
|
||||||
|
|
||||||
local INITCPIO="$1/usr/share/calamares/modules/initcpio.conf"
|
|
||||||
if [ ! -e $INITCPIO ] ; then
|
|
||||||
echo "---" > "$INITCPIO"
|
|
||||||
echo "kernel: ${manjaro_kernel}" >> "$INITCPIO"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -41,18 +41,6 @@ fi
|
||||||
# save settings
|
# save settings
|
||||||
alsactl -f /etc/asound.state store &>/dev/null
|
alsactl -f /etc/asound.state store &>/dev/null
|
||||||
|
|
||||||
#echo "enable default mirror" >> /tmp/livecd.log
|
|
||||||
|
|
||||||
# enable default mirror
|
|
||||||
#cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup
|
|
||||||
#if [ ! -z "$ping_check" ] ; then
|
|
||||||
# pacman-mirrors -g &>/dev/null
|
|
||||||
#fi
|
|
||||||
|
|
||||||
# if [ -e "$1/usr/bin/lightdm" ] ; then
|
|
||||||
# fix_lightdm
|
|
||||||
# fi
|
|
||||||
|
|
||||||
echo "configure system" >> /tmp/livecd.log
|
echo "configure system" >> /tmp/livecd.log
|
||||||
|
|
||||||
# add BROWSER var
|
# add BROWSER var
|
||||||
|
|
@ -76,10 +64,6 @@ configure_ping_live
|
||||||
|
|
||||||
install_localization_live
|
install_localization_live
|
||||||
|
|
||||||
# # set unique machine-id
|
|
||||||
# dbus-uuidgen --ensure=/etc/machine-id
|
|
||||||
# dbus-uuidgen --ensure=/var/lib/dbus/machine-id
|
|
||||||
|
|
||||||
# depmod extramodules
|
# depmod extramodules
|
||||||
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
|
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue