scripts and venom-installer updated

This commit is contained in:
emmett1
2020-08-09 22:20:58 +08:00
parent 5d689ef9d3
commit d518dc5c1b
3 changed files with 31 additions and 21 deletions

View File

@@ -51,6 +51,7 @@ MAIN_PKG="pm-utils sudo scrot hexchat audacious audacious-plugins smplayer alsa-
if [ "$1" ]; then
while [ $1 ]; do
buildiso $1
shift
done
else
for f in $FLAVOR; do

View File

@@ -83,26 +83,28 @@ fi
echo venomlive > /etc/hostname
if [ -d /etc/sv/lxdm ]; then
if [ -x /etc/rc.d/lxdm ]; then
DM=lxdm
elif [ -d /etc/sv/lightdm ]; then
elif [ -x /etc/rc.d/lightdm ]; then
DM=lightdm
elif [ -d /etc/sv/sddm ]; then
elif [ -x /etc/rc.d/sddm ]; then
DM=sddm
elif [ -d /etc/sv/slim ]; then
elif [ -x /etc/rc.d/slim ]; then
DM=slim
fi
if [ -d /etc/sv/networkmanager ]; then
if [ -x /etc/rc.d/networkmanager ]; then
NETWORK=networkmanager
elif [ -d /etc/sv/dhcpcd ]; then
NETWORK=dhcpcd
elif [ -x /etc/rc.d/network ]; then
NETWORK=network
fi
for i in sysklogd dbus $DM $NETWORK bluetooth; do
if [ -d /etc/sv/$i ]; then
ln -sf /etc/sv/$i /var/service
if [ -x /etc/rc.d/$i ]; then
daemon="$daemon $i"
fi
done
sed -i "s/^#DAEMONS=.*/DAEMONS=\"$daemon\"/" /etc/rc.conf
exit 0

View File

@@ -557,19 +557,19 @@ install_now() {
cp -Ra "$CUSTOMIZEDIR"/* $VENOMROOT
fi
if [ -d $VENOMROOT/etc/sv/networkmanager ]; then
if [ -x $VENOMROOT/etc/rc.d/networkmanager ]; then
network=networkmanager
elif [ -d $VENOMROOT/etc/sv/dhcpcd ]; then
network=dhcpcd
elif [ -x $VENOMROOT/etc/rc.d/network ]; then
network=network
fi
if [ -d $VENOMROOT/etc/sv/lxdm ]; then
if [ -x $VENOMROOT/etc/rc.d/lxdm ]; then
dm=lxdm
elif [ -d $VENOMROOT/etc/sv/lightdm ]; then
elif [ -x $VENOMROOT/etc/rc.d/lightdm ]; then
dm=lightdm
elif [ -d $VENOMROOT/etc/sv/sddm ]; then
elif [ -x $VENOMROOT/etc/rc.d/sddm ]; then
dm=sddm
elif [ -d $VENOMROOT/etc/sv/slim ]; then
elif [ -x $VENOMROOT/etc/rc.d/slim ]; then
dm=slim
fi
@@ -579,8 +579,12 @@ install_now() {
# enable services
for d in $daemons; do
if [ -d $VENOMROOT/etc/sv/$d ]; then
run_chroot ln -s /etc/sv/$d /var/service
if [ -x $VENOMROOT/etc/rc.d/$d ]; then
if [ "$dd" ]; then
dd="$dd $d"
else
dd="$d"
fi
fi
done
@@ -588,13 +592,16 @@ install_now() {
echo "$hostname_var" > $VENOMROOT/etc/hostname
# hardware clock
sed "s;#HARDWARECLOCK=.*;HARDWARECLOCK=\"$clock_var\";" -i $VENOMROOT/etc/runit/runit.conf
sed "s;#HARDWARECLOCK=.*;HARDWARECLOCK=\"$clock_var\";" -i $VENOMROOT/etc/rc.conf
# timezone
sed "s;#TIMEZONE=.*;TIMEZONE=\"$timezone_var\";" -i $VENOMROOT/etc/runit/runit.conf
sed "s;#TIMEZONE=.*;TIMEZONE=\"$timezone_var\";" -i $VENOMROOT/etc/rc.conf
# keymap
sed "s;#KEYMAP=.*;KEYMAP=\"$keymap_var\";" -i $VENOMROOT/etc/runit/runit.conf
sed "s;#KEYMAP=.*;KEYMAP=\"$keymap_var\";" -i $VENOMROOT/etc/rc.conf
# daemons
sed "s;#DAEMONS=.*;DAEMONS=\"$dd\";" -i $VENOMROOT/etc/rc.conf
# fstab
print_info "Setup fstab..."