Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=8b87b828c7d1c1033ea2fc9bfdbeec1e1e3f5b29
commit 8b87b828c7d1c1033ea2fc9bfdbeec1e1e3f5b29
Author: janny <[EMAIL PROTECTED]>
Date: Sun Sep 23 15:53:35 2007 +0200
fwlive-xfce
add XFCE appsgroup
other cosmetics in code
diff --git a/Makefile b/Makefile
index e912d22..b22fb18 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,14 @@ install-apps: checkroot
pacman -r ${CHROOTDIR}/${TREE} -Sf ${INST_${APPSGROUP}_APPS} --noconfirm
--config ${PACCONF} ; \
fi ; \
fi
+ifeq ($(APPSGROUP),XFCE)
+ pacman -r ${CHROOTDIR}/${TREE} -Rf kdm --noconfirm --config ${PACCONF}
+ pacman -r ${CHROOTDIR}/${TREE} -Sf gdm --noconfirm --config ${PACCONF}
+endif
+ifeq ($(APPSGROUP),FULL_GTK)
+ pacman -r ${CHROOTDIR}/${TREE} -Rf kdm --noconfirm --config ${PACCONF}
+ pacman -r ${CHROOTDIR}/${TREE} -Sf gdm --noconfirm --config ${PACCONF}
+endif
install-kernel: checkroot
if (( $(shell pacman -r ${CHROOTDIR}/${TREE} -Q kernel-fwlive &>/dev/null; echo
$$?) > 0 )) ; then \
@@ -138,8 +146,8 @@ create-symlinks: checkroot
ln -s /tmp ${CHROOTDIR}/${TREE}/var/tmp ; \
fi
if [ ! -e ${CHROOTDIR}/${TREE}/etc/rc.d/rcS.d/S16rc.fsupd ] ; then \
- ln -s ../rc.fsupd
${CHROOTDIR}/${TREE}/etc/rc.d/rcS.d/S16rc.fsupd ; \
- fi
+ ln -s ../rc.fsupd ${CHROOTDIR}/${TREE}/etc/rc.d/rcS.d/S16rc.fsupd ;
\
+ fi
if [ ! -e ${CHROOTDIR}/${TREE}/etc/rc.d/rc6.d/K95rc.fsupd ] ; then \
ln -s ../rc.fsupd ${CHROOTDIR}/${TREE}/etc/rc.d/rc6.d/K95rc.fsupd ; \
fi
@@ -203,12 +211,13 @@ create-users: checkroot
live-base: checkroot
echo "Include = /etc/pacman.d/janny" >> ${CHROOTDIR}/${TREE}/etc/pacman.conf; \
echo "[janny]" > ${CHROOTDIR}/${TREE}/etc/pacman.d/janny; \
- echo "Server =
http://ftp.frugalware.org/pub/other/people/janny/fwlive/frugalware-i686/"; >>
${CHROOTDIR}/${TREE}/etc/pacman.d/janny; \
+ echo "Server =
http://ftp.frugalware.org/pub/other/people/janny/fwlive/frugalware-i686/"; >>
${CHROOTDIR}/${TREE}/etc/pacman.d/janny; \
cp -a live-base ${CHROOTDIR}/${TREE}/tmp/
mkdir -p ${CHROOTDIR}/${TREE}/tmp/live-base/cd-root/boot/grub
${CHROOTDIR}/${TREE}/tmp/live-base/initrd/rootfs/{lib,bin,etc}
ln -sf configsave ${CHROOTDIR}/${TREE}/usr/local/bin/configrestore
cp ${CHROOTDIR}/${TREE}/tmp/live-base/tools/*
${CHROOTDIR}/${TREE}/usr/local/bin/
cp ${CHROOTDIR}/${TREE}/tmp/live-base/cd-root/linux/make_iso.sh
${CHROOTDIR}/${TREE}/usr/local/bin/
+ chmod 777 ${CHROOTDIR}/${TREE}/usr/local/bin/*
ln -sf make_iso.sh ${CHROOTDIR}/${TREE}/usr/local/bin/make_iso
ln -sf install ${CHROOTDIR}/${TREE}/tmp/live-base/uninstall
ln -sf ../tools/liblinuxlive
${CHROOTDIR}/${TREE}/tmp/live-base/initrd/liblinuxlive
@@ -270,7 +279,7 @@ hacking-kdmrc: checkroot
sed -i "s|#AutoLoginUser=foo|AutoLoginUser=fwlive|"
${CHROOTDIR}/${TREE}/usr/share/config/kdm/kdmrc; \
sed -i "s|PreselectUser=Previous|PreselectUser=None|"
${CHROOTDIR}/${TREE}/usr/share/config/kdm/kdmrc; \
sed -i "s|FocusPasswd=false|FocusPasswd=true|"
${CHROOTDIR}/${TREE}/usr/share/config/kdm/kdmrc; \
- sed -i 's/desktop=""/desktop="\/usr\/bin\/kdm -nodaemon"/'
${CHROOTDIR}/${TREE}/etc/sysconfig/desktop; \
+ sed -i 's/desktop=""/desktop="\/usr\/bin\/kdm -nodaemon"/'
${CHROOTDIR}/${TREE}/etc/sysconfig/desktop; \
fi
create: chroot-mount create-iso chroot-umount
diff --git a/config b/config
index 3b10d5b..575478c 100644
--- a/config
+++ b/config
@@ -14,13 +14,15 @@ FWLLLANG = en_US
FWLFONT = lat2-16.psfu.gz
# select FWLive profile, the following ones are available:
+# * FULL_GTK - for all gtk && xfce packages installed
# * FULL - for all packages installed
# * KDE
+# * XFCE
# * X - minimal graphical environment with fvwm
# * SERVER
# * MIN - comfortable console workstation
# * MUSTHAVE - minimalistic one, base of all profiles
-APPSGROUP = FULL
+APPSGROUP = MUSTHAVE
# grub title part 1
FWLSREL = FWLive-${APPSGROUP}
@@ -83,13 +85,24 @@ INST_SERVER_APPS = ${INST_MIN_APPS} ncftp iptables fuseftp
postfix bind \
dhcpcd lighttpd fcgi
INST_X_APPS = ${INST_MIN_APPS} xorg-server xorg-drivers fvwm mplayer alsa-utils
INST_EXTRA_APPS = gimp gwenview wireshark kaffeine kasablanca ktorrent
+INST_EXTRA_GTK_APPS = gimp wireshark gqview
INST_LOCALE_APPS = firefox-hu firefox-de firefox-fr \
kde-i18n-hu kde-i18n-de kde-i18n-fr \
openoffice.org-dict-hu openoffice.org-dict-fr openoffice.org-dict-de \
openoffice.org-i18n-hu openoffice.org-i18n-de openoffice.org-i18n-fr \
bibletime-i18n k3b-i18n
+INST_LOCALE_GTK_APPS = firefox-hu firefox-de firefox-fr \
+ openoffice.org-dict-hu openoffice.org-dict-fr openoffice.org-dict-de \
+ openoffice.org-i18n-hu openoffice.org-i18n-de openoffice.org-i18n-fr
INST_KDE_APPS = ${INST_X_APPS} kdebase openoffice.org-kde firefox kmplayer \
flashplugin qtparted k3b
+INST_XFCE_APPS = ${INST_X_APPS} dbh gtk-xfce-engine libexo libxfce4mcs
libxfce4util \
+ libxfcegui4 orage terminal thunar thunar-volman xfce-frugalware \
+ xfce-mcs-manager xfce-mcs-plugins xfce-utils xfce4-appfinder \
+ xfce4-dev-tools xfce4-icon-theme xfce4-mixer xfce4-panel xfce4-session \
+ xfce4-trigger-launcher xfdesktop xfprint xfwm4 xfwm4-themes firefox \
+ openoffice.org flashplugin mplayer
INST_FULL_APPS = ${INST_SERVER_APPS} ${INST_KDE_APPS} ${INST_EXTRA_APPS}
${INST_LOCALE_APPS}
+INST_FULL_GTK_APPS = ${INST_SERVER_APPS} ${INST_XFCE_APPS}
${INST_EXTRA_GTK_APPS} ${INST_LOCALE_GTK_APPS}
# vim: ft=make
diff --git a/live-base/.config b/live-base/.config
index 5fcc328..1b0b226 100644
--- a/live-base/.config
+++ b/live-base/.config
@@ -11,7 +11,7 @@ LIVECDNAME="linuxcd"
# the size of RAMdisk (in KBytes)
# if you change this, then you will need to change the same
# in the following files as well: ./cd-root/boot/isolinux.cfg,
./cd-root/boot/DOS/config
-RAM0SIZE=4444
+RAM0SIZE=7777
# kernel version. Change it to "2.6.10" for example, if you are building
# LiveCD with a different kernel than the one you are actually running
diff --git a/live-base/tools/liblinuxlive b/live-base/tools/liblinuxlive
index 9e58c00..d5eff0f 100644
--- a/live-base/tools/liblinuxlive
+++ b/live-base/tools/liblinuxlive
@@ -557,19 +557,20 @@ fstab_update()
# add special options for NTFS
if [ "$FS" = "ntfs" ]; then
- OPT=",rw"
- if [ "$IOCHARSET" != "" ]; then FS="ntfs-3g"
OPT="$OPT,nls=$IOCHARSET"; fi
+ OPT=",rw,gid=100,"
+ FS="ntfs-3g"
+ if [ "$IOCHARSET" != "" ]; then OPT="$OPT,locale=en_US.UTF-8"; fi
fi
# add special options for VFAT
- if [ "$FS" = "vfat" -a "$IOCHARSET" != "" ]; then
OPT=",iocharset=$IOCHARSET"; fi
+ if [ "$FS" = "vfat" -a "$IOCHARSET" != "" ]; then
OPT=",noatime,users,suid,dev,exec,iocharset=$IOCHARSET"; fi
# if the partition has filesystem, add it to fstab
if [ "$FS" != "" ]; then
if [ "$FS" = "swap" ]; then
fstab_update_line $FSTAB~ $DEVICE swap swap $AUTO,defaults
else
- fstab_update_line $FSTAB~ $DEVICE $MOUNTDIR $FS
$AUTO,noatime,users,suid,dev,exec$OPT
+ fstab_update_line $FSTAB~ $DEVICE $MOUNTDIR $FS $AUTO$OPT
mkdir -p "$1/$MOUNTDIR"
fi
fi
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
