diff --git a/linux-live/basesystem/01-core/package.list b/linux-live/basesystem/01-core/package.list index 74f7a1a..ac87f52 100644 --- a/linux-live/basesystem/01-core/package.list +++ b/linux-live/basesystem/01-core/package.list @@ -46,4 +46,5 @@ usb-modeswitch pm-utils wget openssh-server -open-vm-tools \ No newline at end of file +open-vm-tools +network-manager \ No newline at end of file diff --git a/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/ssh.service b/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/ssh.service index a29b18e..6196003 100644 --- a/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/ssh.service +++ b/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/ssh.service @@ -5,7 +5,7 @@ ConditionPathExists=!/etc/ssh/sshd_not_to_be_run [Service] EnvironmentFile=-/etc/default/ssh -ExecStartPre=-/bin/sh -c 'if ! ls /etc/ssh/ssh_host_* >/dev/null 2>&1; then /usr/sbin/dpkg-reconfigure openssh-server; fi' +ExecStartPre=-/bin/sh -c 'if ! ls /etc/ssh/ssh_host_* >/dev/null 2>&1; then /usr/sbin/dpkg-reconfigure openssh-server; mkdir -p /run/sshd; fi' ExecStart=/usr/sbin/sshd -D $SSHD_OPTS ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/linux-live/minioslib b/linux-live/minioslib index 3137957..4c7cd27 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -1051,7 +1051,28 @@ function chroot_configure() { live ALL=(ALL) NOPASSWD:ALL EOF - systemctl enable dhclient >>$OUTPUT 2>&1 + if [ ! -d /etc/NetworkManager ]; then + echo "Enable dhclient.service autostart." >>$OUTPUT 2>&1 + cat </usr/lib/systemd/system/dhclient.service +[Unit] +Description=DHCP Client +Documentation=man:dhclient(8) +Wants=network.target +After=network-pre.target systemd-sysctl.service systemd-modules-load.service +Before=network.target shutdown.target network-online.target +ConditionPathExists=!/run/initramfs/net.up.flag + +[Service] +Type=forking +ExecStart=-/bin/sh -c 'udevadm settle && dhclient -nw' +PIDFile=/run/dhclient.pid + +[Install] +WantedBy=multi-user.target +WantedBy=network-online.target +EOF + systemctl enable dhclient >>$OUTPUT 2>&1 + fi if [ -f /etc/systemd/system/multi-user.target.wants/grub-initrd-fallback.service ]; then echo "Disable grub-initrd-fallback.service autostart." diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/startup b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/startup index a65afaf..db3208b 100644 --- a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/startup +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/startup @@ -36,13 +36,16 @@ xset -dpms volumeicon & # preload compton and fluxbox to cache -(compton --help; fluxbox --help) >/dev/null 2>&1 +( + compton --help + fluxbox --help +) >/dev/null 2>&1 # Keep black screen for first second while the sound plays. # This slows startup a little, but it is nicer effect. SND=/usr/share/sounds/startup.wav if [ -r $SND ]; then - cat $SND > /dev/null # preload + cat $SND >/dev/null # preload aplay $SND & sleep 1 & SOUNDPID=$! @@ -51,9 +54,9 @@ fi # Debian-local change: # - fbautostart has been added with a quick hack to check to see if it # exists. If it does, we'll start it up by default. -which fbautostart > /dev/null +which fbautostart >/dev/null if [ $? -eq 0 ]; then - fbautostart + fbautostart fi # We need to postpone compton after fluxbox starts, else it won't set @@ -73,9 +76,16 @@ rm -f $SIGNAL2 2>/dev/null done touch $SIGNAL2 - (sleep 1; (echo; sleep 10; echo :quit) | xlunch --window --xposition 20 --yposition -30 \ - --width 195 --height 53 --noscroll --noprompt --backgroundcolor ffffff00 \ - --multiple --desktop --button "/usr/share/fluxbox/styles/Slax/pixmaps/start-here.png;;0,0;fbappselect" & ) & + ( + sleep 1 + ( + echo + sleep 10 + echo :quit + ) | xlunch --window --xposition 20 --yposition -30 \ + --width 195 --height 53 --noscroll --noprompt --backgroundcolor ffffff00 \ + --multiple --desktop --button "/usr/share/fluxbox/styles/Slax/pixmaps/start-here.png;;0,0;fbappselect" & + ) & exec compton --sw-opti -e 0.9 --shadow-exclude 'class_g="xlunch-windowed"' --fade-exclude 'role*="fluxbox-toolbar"' --opacity-rule '70:role*="fluxbox-toolbar"' --no-fading-destroyed-argb -D 5 -c -f -l -2 -t -2 -r 0 -o 1 -z --shadow-exclude 'bounding_shaped' ) & @@ -98,13 +108,17 @@ rm -f $SIGNAL2 2>/dev/null ) & # gen screen resolutions to fluxbox menu -xrandr 2>/dev/null | fgrep x | fgrep . | sort -n | tr -s " " | cut -d " " -f 2 \ -| sed -r "s:(.*):[exec] (\\1) {fbscreensize \\1}:" > ~/.fluxbox/menu_resolution +xrandr 2>/dev/null | fgrep x | fgrep . | sort -n | tr -s " " | cut -d " " -f 2 | + sed -r "s:(.*):[exec] (\\1) {fbscreensize \\1}:" >~/.fluxbox/menu_resolution # In all cases, wait for the sound sleeper. # If startup took longer (sound completed already), no extra wait wait $SOUNDPID +if [ -f /usr/bin/nm-applet ]; then + exec nm-applet & +fi + # And last but not least we start fluxbox. # Because it is the last app you have to run it with ''exec'' before it. diff --git a/linux-live/modules/03-desktop/rootcopy/root/.fluxbox/menu b/linux-live/modules/03-desktop/rootcopy/root/.fluxbox/menu index f55cc8f..f892180 100644 --- a/linux-live/modules/03-desktop/rootcopy/root/.fluxbox/menu +++ b/linux-live/modules/03-desktop/rootcopy/root/.fluxbox/menu @@ -2,7 +2,7 @@ [exec] (Terminal) { fbstartupnotify && xterm -ls } [exec] (File Manager) { fbstartupnotify && pcmanfm } [exec] (Web Browser) { fbstartupnotify && fbliveapp chromium } - [exec] (Text Editor) { fbstartupnotify && leafpad } + [exec] (Text Editor) { fbstartupnotify && medit } [exec] (Calculator) { fbstartupnotify && qalculate } [exec] (Network Manager) { fbstartupnotify && wicd-manager } [exec] (Run) { fbappselect } diff --git a/linux-live/modules/03-desktop/rootcopy/root/.fluxbox/startup b/linux-live/modules/03-desktop/rootcopy/root/.fluxbox/startup index fcf7527..b725d66 100644 --- a/linux-live/modules/03-desktop/rootcopy/root/.fluxbox/startup +++ b/linux-live/modules/03-desktop/rootcopy/root/.fluxbox/startup @@ -105,6 +105,10 @@ xrandr 2>/dev/null | fgrep x | fgrep . | sort -n | tr -s " " | cut -d " " -f 2 \ # If startup took longer (sound completed already), no extra wait wait $SOUNDPID +if [ -f /usr/bin/nm-applet ]; then + exec nm-applet & +fi + # And last but not least we start fluxbox. # Because it is the last app you have to run it with ''exec'' before it. diff --git a/linux-live/modules/04-apps/install b/linux-live/modules/04-apps/install index 9fdcc72..7e0afab 100644 --- a/linux-live/modules/04-apps/install +++ b/linux-live/modules/04-apps/install @@ -11,7 +11,7 @@ apt-get install --no-install-recommends --yes \ pcmanfm \ lxtask \ xarchiver xdg-utils libgconf-2-4 \ - wicd >>$OUTPUT 2>&1 + network-manager-gnome >>$OUTPUT 2>&1 (cd /rootcopy && cp --parents -afr * /) diff --git a/linux-live/modules/04-apps/install2 b/linux-live/modules/04-apps/install2 index d9e0ddd..f7eb901 100644 --- a/linux-live/modules/04-apps/install2 +++ b/linux-live/modules/04-apps/install2 @@ -28,11 +28,13 @@ make >>$OUTPUT 2>&1 strip --strip-unneeded src/pcmanfm >>$OUTPUT 2>&1 cp src/pcmanfm /squashfs-root/usr/bin >>$OUTPUT 2>&1 -rm -f /squashfs-root/usr/share/applications/leafpad.desktop >>$OUTPUT 2>&1 +#rm -f /squashfs-root/usr/share/applications/leafpad.desktop >>$OUTPUT 2>&1 rm -f /squashfs-root/usr/share/applications/medit.desktop >>$OUTPUT 2>&1 rm -f /squashfs-root/usr/share/applications/qalculate-gtk.desktop >>$OUTPUT 2>&1 rm -f /squashfs-root/usr/share/applications/pcmanfm.desktop >>$OUTPUT 2>&1 -rm -f /squashfs-root/usr/share/applications/wicd.desktop >>$OUTPUT 2>&1 +#rm -f /squashfs-root/usr/share/applications/wicd.desktop >>$OUTPUT 2>&1 +rm -f /squashfs-root/usr/share/applications/nm-applet.desktop >>$OUTPUT 2>&1 +rm -f /squashfs-root/usr/share/applications/nm-connection-editor.desktop >>$OUTPUT 2>&1 rm -f /squashfs-root/usr/share/applications/lxtask.desktop >>$OUTPUT 2>&1 dir2sb /squashfs-root /04-apps.sb >>$OUTPUT 2>&1 diff --git a/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/dhclient.service b/unused_modules/dhclient.service similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/dhclient.service rename to unused_modules/dhclient.service