Briq
/
linux-live
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

skip squashfs filesystems in media, update xlunch

pull/40/head
TomasM 2017-12-15 05:46:39 -05:00
parent 1093026183
commit cb0039761a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Slax/debian/modules/03-desktop/build
View File

@ -54,12 +54,13 @@ cp debian/$NAME/usr/bin/fluxbox /squashfs-root/usr/bin
# add xlunch from sources # add xlunch from sources
wget -O /tmp/xlunch.tar.gz https://github.com/Tomas-M/xlunch/archive/v3.1.3.tar.gz wget -O /tmp/xlunch.tar.gz https://github.com/Tomas-M/xlunch/archive/v3.2.4.tar.gz
cd /tmp cd /tmp
tar -xf xlunch.tar.gz tar -xf xlunch.tar.gz
cd xlunch-3.1.3 cd xlunch-3.2.4
make make
cp xlunch /squashfs-root/usr/bin cp xlunch /squashfs-root/usr/bin
cp extra/gentriesquick /squashfs-root/usr/bin/xlunch_genquick
mkdir -p /squashfs-root/usr/share/icons/hicolor/48x48/apps/ mkdir -p /squashfs-root/usr/share/icons/hicolor/48x48/apps/
cp extra/ghost.png /squashfs-root/usr/share/icons/hicolor/48x48/apps/xlunch_ghost.png cp extra/ghost.png /squashfs-root/usr/share/icons/hicolor/48x48/apps/xlunch_ghost.png

2
Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
COMMAND=$( COMMAND=$(
xlunch --input /etc/xlunch/entries.dsv \ xlunch --input /etc/xlunch/entries.dsv --scroll \
--background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \ --background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \
--voidclickterminate --iconpadding 30 --textpadding 10 \ --voidclickterminate --iconpadding 30 --textpadding 10 \
--paddingswap --leastmargin 10 --hidemissing --iconsize 128 \ --paddingswap --leastmargin 10 --hidemissing --iconsize 128 \

2
livekitlib
View File

@ -804,7 +804,7 @@ fstab_create()
FS="$(device_tag $DEVICE TYPE)" FS="$(device_tag $DEVICE TYPE)"
LABEL="$(device_tag $DEVICE LABEL | sed -r "s:[/ ]:_:g")" LABEL="$(device_tag $DEVICE LABEL | sed -r "s:[/ ]:_:g")"
if [ "$LABEL" = "" ]; then LABEL="$(basename $DEVICE)"; fi if [ "$LABEL" = "" ]; then LABEL="$(basename $DEVICE)"; fi
if [ "$FS" != "swap" ]; 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
fi fi