Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=0e57a518fe21d88c60ef5507b5745be106b84bb2
commit 0e57a518fe21d88c60ef5507b5745be106b84bb2
Author: janny <[EMAIL PROTECTED]>
Date: Thu Sep 27 08:44:57 2007 +0200
fwlive-xfce
* fixed xfce desktop file
* remove gdm
* changed subgroups in appsgroups
diff --git a/Makefile b/Makefile
index b184c00..a277c25 100644
--- a/Makefile
+++ b/Makefile
@@ -93,10 +93,10 @@ install-apps: checkroot
fi ; \
fi
ifeq ($(APPSGROUP),XFCE)
- pacman -r ${CHROOTDIR}/${TREE} -Sf gdm --noconfirm --config ${PACCONF}
+ sed -i 's/desktop=""/desktop="startxfce4"/'
${CHROOTDIR}/${TREE}/etc/sysconfig/desktop
endif
ifeq ($(APPSGROUP),FULL_GTK)
- pacman -r ${CHROOTDIR}/${TREE} -Sf gdm --noconfirm --config ${PACCONF}
+ sed -i 's/desktop=""/desktop="startxfce4"/'
${CHROOTDIR}/${TREE}/etc/sysconfig/desktop
endif
install-kernel: checkroot
@@ -174,7 +174,7 @@ create-files: checkroot
chmod +x ${CHROOTDIR}/${TREE}/etc/profile.d/lang.sh
echo "[eth0]" >${CHROOTDIR}/${TREE}/etc/sysconfig/network/default
echo "options = dhcp" >>${CHROOTDIR}/${TREE}/etc/sysconfig/network/default
- echo "127.0.0.1 localhost fwlive"
>${CHROOTDIR}/${TREE}/etc/hosts
+ echo "127.0.0.1 localhost ${FWLHOST}"
>${CHROOTDIR}/${TREE}/etc/hosts
sed -i "s|id:4:initdefault:|id:3:initdefault:|" ${CHROOTDIR}/${TREE}/etc/inittab
sed -i "s|NUMLOCK_ON=1|NUMLOCK_ON=0|" ${CHROOTDIR}/${TREE}/etc/sysconfig/numlock
sed -i "s|dev.cdrom.lock=0|dev.cdrom.lock=1|"
${CHROOTDIR}/${TREE}/etc/sysctl.conf
diff --git a/config b/config
index 9fd0df9..40c420c 100644
--- a/config
+++ b/config
@@ -83,7 +83,7 @@ INST_MIN_APPS = ${INST_MUSTHAVE_APPS} ${DRIVERS} openssh mc
wget lynx nmap \
INST_SERVER_APPS = ${INST_MIN_APPS} ncftp iptables fuseftp postfix bind \
mysql libmysqlclient php php-cgi apache pure-ftpd phpmyadmin samba dhcp \
dhcpcd lighttpd fcgi
-INST_X_APPS = ${INST_MIN_APPS} xorg-server xorg-drivers fvwm mplayer alsa-utils
+INST_X_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 \
@@ -94,15 +94,15 @@ INST_LOCALE_APPS = firefox-hu firefox-de firefox-fr \
INST_LOCALE_GTK_APPS = firefox-hu firefox-de firefox-fr firefox-da
openoffice.org-i18n-da \
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 \
+INST_KDE_APPS = ${INST_MIN_APPS} ${INST_X_APPS} kdebase openoffice.org-kde
firefox kmplayer \
flashplugin qtparted k3b
-INST_XFCE_APPS = ${INST_X_APPS} gtk-xfce-engine libexo libxfce4mcs
libxfce4util \
+INST_XFCE_APPS = ${INST_MIN_APPS} ${INST_X_APPS} gtk-xfce-engine libexo
libxfce4mcs libxfce4util \
libxfcegui4 orage terminal thunar thunar-volman xfce-frugalware xsetroot \
xfce-mcs-manager xfce-mcs-plugins xfce-utils xfce4-appfinder \
xfce4-dev-tools xfce4-icon-theme xfce4-mixer xfce4-panel xfce4-session \
xfdesktop xfprint xfwm4 xfwm4-themes firefox \
openoffice.org flashplugin mplayer
INST_FULL_APPS = ${INST_MIN_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}
+INST_FULL_GTK_APPS = ${INST_XFCE_APPS} ${INST_EXTRA_GTK_APPS}
${INST_LOCALE_GTK_APPS}
# vim: ft=make
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
