add more firmware to slax, do not use device labels in media, chown guest dir

pull/40/head
TomasM 2017-12-15 10:48:05 -05:00
parent 443a0fcdd2
commit f0fc8f5255
4 changed files with 8 additions and 5 deletions

View File

@ -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 \ 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 \ 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 \ 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 ln -sf bash /bin/sh

View File

@ -9,6 +9,7 @@ rm -Rf /usr/share/icons/gnome/256x256
mv /usr/bin/chromium /usr/bin/chromium-launcher mv /usr/bin/chromium /usr/bin/chromium-launcher
(cd rootcopy && cp --parents -afr * /) (cd rootcopy && cp --parents -afr * /)
chown guest.users /home/guest
chown -R guest.users /home/guest/.config chown -R guest.users /home/guest/.config
rm -Rf /squashfs-root/root/.fluxbox rm -Rf /squashfs-root/root/.fluxbox

View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Name=Web Browser Name=Web Browser
Exec=/usr/bin/chromium Exec=chromium
Terminal=false Terminal=false
Icon=chromium Icon=chromium

View File

@ -800,10 +800,9 @@ fstab_create()
echo >> $FSTAB 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)" FS="$(device_tag $DEVICE TYPE)"
LABEL="$(device_tag $DEVICE LABEL | sed -r "s:[/ ]:_:g")" LABEL="$(basename $DEVICE)"
if [ "$LABEL" = "" ]; then LABEL="$(basename $DEVICE)"; fi
if [ "$FS" != "swap" -a "$FS" != "squashfs" ]; then if [ "$FS" != "swap" -a "$FS" != "squashfs" ]; then
mkdir -p "$1/media/$LABEL" mkdir -p "$1/media/$LABEL"
echo "$DEVICE" "/media/$LABEL" $FS defaults,noatime 0 0 >> $FSTAB echo "$DEVICE" "/media/$LABEL" $FS defaults,noatime 0 0 >> $FSTAB