diff --git a/Slax/debian/cleanup b/Slax/debian/cleanup index de385ec..05fdcf1 100644 --- a/Slax/debian/cleanup +++ b/Slax/debian/cleanup @@ -45,7 +45,6 @@ rm -Rf /usr/share/man/*_* rm -Rf /usr/share/icons/elementaryXubuntu-dark rm -Rf /usr/share/icons/gnome/256x256 - # Unzip gzipped files (man pages), so LZMA can compress 2times better. # First we fix symlinks, then uncompress files # $1 = search directory @@ -65,7 +64,6 @@ uncompress_files() uncompress_files /etc/alternatives uncompress_files /usr/share/man - # remove broken links # $1 = search directory remove_broken_links() diff --git a/initramfs/initramfs_create b/initramfs/initramfs_create index eec143d..fdff553 100755 --- a/initramfs/initramfs_create +++ b/initramfs/initramfs_create @@ -50,6 +50,7 @@ cp static/eject $INITRAMFS/bin cp static/mount.dynfilefs $INITRAMFS/bin/@mount.dynfilefs cp static/mount.httpfs2 $INITRAMFS/bin/@mount.httpfs2 cp static/mount.ntfs-3g $INITRAMFS/bin/@mount.ntfs-3g +cp static/blkid $INITRAMFS/bin chmod a+x $INITRAMFS/bin/* $INITRAMFS/bin/busybox | grep , | grep -v Copyright | tr "," " " | while read LINE; do diff --git a/initramfs/static/blkid b/initramfs/static/blkid new file mode 100755 index 0000000..feaf742 Binary files /dev/null and b/initramfs/static/blkid differ diff --git a/initramfs/static/busybox b/initramfs/static/busybox index bd75e8f..be60508 100755 Binary files a/initramfs/static/busybox and b/initramfs/static/busybox differ diff --git a/livekitlib b/livekitlib index 30c103a..e5b1532 100644 --- a/livekitlib +++ b/livekitlib @@ -165,7 +165,7 @@ modprobe_everything() echo_green_star >&2 echo "Probing for hardware" >&2 - find /lib/modules/ | fgrep .ko | egrep $1 $2 | xargs -n 1 modprobe 2>/dev/null + find /lib/modules/ | fgrep .ko | egrep $1 $2 | sed -r "s:^.*/|[.]ko\$::g" | xargs -n 1 modprobe 2>/dev/null refresh_devs } @@ -204,7 +204,7 @@ init_zram() if [ -r /sys/block/zram0/disksize ]; then echo 536870912 > /sys/block/zram0/disksize # 512MB mkswap /dev/zram0 >/dev/null - swapon /dev/zram0 -p 32767 + swapon /dev/zram0 echo 100 > /proc/sys/vm/swappiness fi } @@ -286,7 +286,7 @@ device_bestfs() debug_log "device_bestfs" "$*" local FS - FS="$(blkid "$1" | sed -r "s/.*TYPE=//" | tr -d '"' | tr [A-Z] [a-z])" + FS="$(blkid -s TYPE "$1" | sed -r "s/.*TYPE=//" | tr -d '"' | tr [A-Z] [a-z])" if [ "$FS" = "msdos" -o "$FS" = "fat" -o "$FS" = "vfat" ]; then FS="vfat" elif [ "$FS" = "ntfs" ]; then @@ -787,7 +787,7 @@ change_root() cd "$1" # make sure important device files and directories are in union - mkdir -p boot dev proc sys tmp mnt run + mkdir -p boot dev proc sys tmp media mnt run chmod 1777 tmp if [ ! -e dev/console ]; then mknod dev/console c 5 1; fi if [ ! -e dev/tty ]; then mknod dev/tty c 5 0; fi