From f0fc8f5255e74cb8b38f44e0f1b3df02bf6a94ed Mon Sep 17 00:00:00 2001 From: TomasM Date: Fri, 15 Dec 2017 10:48:05 -0500 Subject: [PATCH] add more firmware to slax, do not use device labels in media, chown guest dir --- Slax/debian/install | 5 ++++- Slax/debian/modules/05-chromium/build | 1 + .../rootcopy/usr/share/applications/chromium.desktop | 2 +- livekitlib | 5 ++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Slax/debian/install b/Slax/debian/install index e219898..d73910f 100644 --- a/Slax/debian/install +++ b/Slax/debian/install @@ -7,7 +7,10 @@ apt-get dist-upgrade --yes apt-get install --yes --no-install-recommends mc squashfs-tools genisoimage zip unzip psmisc net-tools \ alsa-utils man less xz-utils ca-certificates openssl acpid acpi-support-base powermgmt-base bzip2 gpart \ hdparm sdparm mdadm smartmontools dosfstools lsof htop gddrescue rsync netcat ssh gpm wireless-tools \ -firmware-linux-free firmware-linux-nonfree +firmware-linux-free firmware-linux-nonfree \ +firmware-atheros firmware-bnx2 firmware-brcm80211 firmware-cavium \ +firmware-ipw2x00 firmware-iwlwifi firmware-libertas firmware-realtek \ +firmware-ti-connectivity firmware-zd1211 ln -sf bash /bin/sh diff --git a/Slax/debian/modules/05-chromium/build b/Slax/debian/modules/05-chromium/build index 64f4025..1d0fa4e 100755 --- a/Slax/debian/modules/05-chromium/build +++ b/Slax/debian/modules/05-chromium/build @@ -9,6 +9,7 @@ rm -Rf /usr/share/icons/gnome/256x256 mv /usr/bin/chromium /usr/bin/chromium-launcher (cd rootcopy && cp --parents -afr * /) +chown guest.users /home/guest chown -R guest.users /home/guest/.config rm -Rf /squashfs-root/root/.fluxbox diff --git a/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop b/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop index 7aacb41..c752fa9 100644 --- a/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop +++ b/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop @@ -1,5 +1,5 @@ [Desktop Entry] Name=Web Browser -Exec=/usr/bin/chromium +Exec=chromium Terminal=false Icon=chromium diff --git a/livekitlib b/livekitlib index 02e2aac..f3442b2 100644 --- a/livekitlib +++ b/livekitlib @@ -800,10 +800,9 @@ fstab_create() echo >> $FSTAB - blkid | cut -d: -f 1 | while read DEVICE; do + blkid | grep -v "^/dev/loop" | cut -d: -f 1 | while read DEVICE; do FS="$(device_tag $DEVICE TYPE)" - LABEL="$(device_tag $DEVICE LABEL | sed -r "s:[/ ]:_:g")" - if [ "$LABEL" = "" ]; then LABEL="$(basename $DEVICE)"; fi + LABEL="$(basename $DEVICE)" if [ "$FS" != "swap" -a "$FS" != "squashfs" ]; then mkdir -p "$1/media/$LABEL" echo "$DEVICE" "/media/$LABEL" $FS defaults,noatime 0 0 >> $FSTAB