diff options
Diffstat (limited to 'setup2hd/setup.liveslak.tpl')
| -rw-r--r-- | setup2hd/setup.liveslak.tpl | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/setup2hd/setup.liveslak.tpl b/setup2hd/setup.liveslak.tpl index 3f34852..fb6e03e 100644 --- a/setup2hd/setup.liveslak.tpl +++ b/setup2hd/setup.liveslak.tpl @@ -108,7 +108,7 @@ After that, you will be asked to set the root password." 11 55 root:${UACCOUNT}:OWNPASS root:ALL EXCEPT GROUP wheel:DENY EOT - chmod 600 ${LIVE_ROOTDIR}/etc/suauth + chmod 600 ${T_PX}/etc/suauth fi # Configure sudoers: @@ -125,6 +125,18 @@ EOT unset UPASS fi + # Add a rc.firewall script: + install -D -m0775 -t ${T_PX}/etc/rc.d/ /usr/share/@LIVEMAIN@/rc.firewall + # Install a firewall configuration script: + install -D -m755 /usr/share/@LIVEMAIN@/SeTfirewall ${T_PX}/usr/sbin/myfwconf + # Add a Slackware setup script invoking that 'myfwconf' script: + cat <<EOT >${T_PX}/var/log/setup/setup.firewall +#!/bin/sh +#BLURB="Configure a basic firewall." +chroot . usr/sbin/myfwconf +EOT + chmod 0775 ${T_PX}/var/log/setup/setup.firewall + # Re-use some of the custom configuration from 0099-@DISTRO@_zzzconf-*.sxz # (some of these may not be present but the command will not fail): ${DIALOG} --backtitle "@CDISTRO@ Linux Setup (Live Edition)" \ @@ -150,7 +162,7 @@ EOT /etc/slackpkg \ /etc/vconsole.conf \ /var/lib/sddm/state.conf \ - /var/lib/slackpkg/current + /var/lib/slackpkg # Point xdm to the custom /etc/X11/xdm/liveslak-xdm/xdm-config: sed -i ${T_PX}/etc/rc.d/rc.4 -e 's,bin/xdm -nodaemon,& -config /etc/X11/xdm/liveslak-xdm/xdm-config,' # If gcc was not installed, create a symlink to cpp pointing to mcpp; @@ -161,7 +173,7 @@ EOT # If nvi was not installed, do not use it as a default selection: if [ ! -x ${T_PX}/usr/bin/nvi ] && [ -e ${T_PX}/var/log/setup/setup.vi-ex ]; then - sed -e 's/default-item "nvi/"default-item "elvis"/' -i ${T_PX}/var/log/setup/setup.vi-ex + sed -e 's/default-item "nvi/default-item "elvis/' -i ${T_PX}/var/log/setup/setup.vi-ex fi # Prevent SeTconfig from asking redundant questions later on: sed -i /usr/share/@LIVEMAIN@/SeTconfig \ @@ -212,7 +224,8 @@ EOT /home/@LIVEUID@/.jackdrc \ /home/@LIVEUID@/.config/autostart/qjackctl.desktop \ /home/@LIVEUID@/.config/rncbc.org/QjackCtl.conf \ - /home/@LIVEUID@/.config/kscreenlockerrc + /home/@LIVEUID@/.config/kscreenlockerrc \ + /home/@LIVEUID@/.config/plasmarc fi fi @@ -239,13 +252,12 @@ EOT - default runlevel - keyboard layout - language setting - After finishing system configuration and before rebooting, you can add any further Live modules from /@LIVEMAIN@/addons/ and /@LIVEMAIN@/optional/ to your hard drive, using a command similar to this: - # unsquashfs -f -dest $T_PX /mnt/livemedia/@LIVEMAIN@/addons/mymodule.sxz + - slackpkg/slackpkg+ EOF ${DIALOG} --backtitle "@CDISTRO@ Linux Setup (Live Edition)" \ --title "POST INSTALL HINTS AND TIPS" --msgbox "`cat $TMP/tempmsg`" \ - 20 65 + 19 65 rm $TMP/tempmsg MAINSELECT="CONFIGURE" |