diff options
-rwxr-xr-x | make_slackware_live.sh | 24 | ||||
-rw-r--r-- | pkglists/cinnamon.conf | 9 | ||||
-rw-r--r-- | pkglists/cinnamon.lst | 45 | ||||
-rw-r--r-- | pkglists/mate.conf (renamed from pkglists/msb.conf) | 1 | ||||
-rw-r--r-- | pkglists/mate.lst (renamed from pkglists/msb.lst) | 0 |
5 files changed, 72 insertions, 7 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 9999035..01ae51d 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -61,10 +61,10 @@ LIVEPW=${LIVEPW:-"live"} LIVE_HOSTNAME=${LIVE_HOSTNAME:-"darkstar"} # What type of Live image? -# Choices are: SLACKWARE, XFCE, KDE4, PLASMA5, MSB. +# Choices are: SLACKWARE, XFCE, KDE4, PLASMA5, MATE, CINNAMON LIVEDE=${LIVEDE:-"SLACKWARE"} -# What runlevel to use if adding a DE like: XFCE, KDE4, PLASMA5, MSB. +# What runlevel to use if adding a DE like: XFCE, KDE4, PLASMA5 etc... RUNLEVEL=${RUNLEVEL:-4} # Use the graphical syslinux menu (YES or NO)? @@ -134,7 +134,11 @@ SEQ_PLASMA5="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,kde4 # List of Slackware package series with MSB instead of KDE 4 (full install): # - each will become a squashfs module: -SEQ_MSB="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,msb local:slackpkg+" +SEQ_MSB="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,mate local:slackpkg+" + +# List of Slackware package series with Cinnamon instead of KDE4 (full install): +# - each will become a squashfs module: +SEQ_CIN="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,cinnamon local:slackpkg+" # List of kernel modules required for a live medium to boot properly: KMODS=${KMODS:-"squashfs:overlay:loop:xhci-pci:ehci-pci:uhci_hcd:usb-storage:hid:usbhid:hid_generic:jbd:mbcache:ext3:ext4:isofs:fat:nls_cp437:nls_iso8859-1:msdos:vfat"} @@ -397,7 +401,7 @@ EOT # Action! # --------------------------------------------------------------------------- -while getopts "d:efhm:r:s:t:v" Option +while getopts "d:efhm:r:s:t:vHR" Option do case $Option in h ) cat <<-"EOH" @@ -428,6 +432,7 @@ do echo " -t <doc|mandoc> Trim the ISO for size (remove man and/or doc)" echo " -v Show debug/error output." echo " -H <hostname> Hostname of the Live OS (default: $LIVE_HOSTNAME)" + echo " -R <runlevel> Runlevel to start with (default: $RUNLEVEL)" exit ;; d ) LIVEDE="$(echo ${OPTARG} |tr a-z A-Z)" @@ -448,6 +453,8 @@ do ;; H ) LIVE_HOSTNAME="${OPTARG}" ;; + R ) RUNLEVEL="${OPTARG}" + ;; * ) echo "You passed an illegal switch to the program!" echo "Run '$0 -h' for more help." exit @@ -549,7 +556,8 @@ case "$LIVEDE" in XFCE) MSEQ="${SEQ_XFCEBASE}" ;; KDE4) MSEQ="${SEQ_KDE4BASE}" ;; PLASMA5) MSEQ="${SEQ_PLASMA5}" ;; - MSB) MSEQ="${SEQ_MSB}" ;; + MATE) MSEQ="${SEQ_MSB}" ;; + CINNAMON) MSEQ="${SEQ_CIN}" ;; *) echo "** Unsupported configuration '$LIVEDE'"; exit 1 ;; esac @@ -972,8 +980,10 @@ elif [ "$LIVEDE" = "KDE4" ]; then ln -sf xinitrc.kde ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc elif [ "$LIVEDE" = "PLASMA5" ]; then ln -sf xinitrc.plasma ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc -elif [ "$LIVEDE" = "MSB" ]; then +elif [ "$LIVEDE" = "MATE" ]; then ln -sf xinitrc.mate-session ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc +elif [ "$LIVEDE" = "CINNAMON" ]; then + ln -sf xinitrc.cinnamon-session ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc else ln -sf xinitrc.xfce ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc fi @@ -1210,7 +1220,7 @@ if [ -f ${LIVE_TOOLDIR}/optional/*.sxz ]; then fi if [ "$LIVEDE" != "XFCE" -a -f ${LIVE_TOOLDIR}/graphics/*.sxz ]; then - # KDE/PLASMA/MSB will profit; add custom (proprietary) graphics drivers: + # KDE/PLASMA etc will profit; add custom (proprietary) graphics drivers: echo "-- Adding binary GPU drivers." cp ${LIVE_TOOLDIR}/graphics/*.sxz ${LIVE_MOD_OPT}/ fi diff --git a/pkglists/cinnamon.conf b/pkglists/cinnamon.conf new file mode 100644 index 0000000..dca6bca --- /dev/null +++ b/pkglists/cinnamon.conf @@ -0,0 +1,9 @@ +# Repository: http://slackware.org.uk/csb/testing/x86_64/ +SL_REPO="/mnt/auto/sox/ftp/pub/Linux/Slackware/csb/testing/${SL_ARCH}" + +# Package root directory: +SL_PKGROOT=${SL_REPO} + +# Patches root directory: +SL_PATCHROOT="" + diff --git a/pkglists/cinnamon.lst b/pkglists/cinnamon.lst new file mode 100644 index 0000000..aaa85b9 --- /dev/null +++ b/pkglists/cinnamon.lst @@ -0,0 +1,45 @@ +BeautifulSoup +accountsservice +alacarte +caribou +cinnamon +cinnamon-control-center +cinnamon-desktop +cinnamon-menus +cinnamon-screensaver +cinnamon-session +cinnamon-settings-daemon +cinnamon-themes +cinnamon-translations +cjs +clutter +clutter-gtk +cogl +colord +gksu +gnome-common +gnome-menus +json-c +json-glib +krb5 +libgee +libgksu +libgnomekbd +libgtop +libgusb +lxml +metacity +mozjs +muffin +nemo +pam +pam_unix2 +pangox-compat +pexpect +polib +ptyprocess +pulseaudio +python-pam +speex +vala +zenity diff --git a/pkglists/msb.conf b/pkglists/mate.conf index 8158f3e..2683596 100644 --- a/pkglists/msb.conf +++ b/pkglists/mate.conf @@ -1,3 +1,4 @@ +# Repository: http://slackware.org.uk/msb/testing/1.12/x86_64/ SL_REPO="/mnt/auto/sox/ftp/pub/Linux/Slackware/msb/testing/1.12/${SL_ARCH}" # Package root directory: diff --git a/pkglists/msb.lst b/pkglists/mate.lst index f9f447d..f9f447d 100644 --- a/pkglists/msb.lst +++ b/pkglists/mate.lst |