[Fusionforge-commits] r8983 - in trunk/tools/simple-cdd: . profiles profiles/templates

Christian Bayle cbayle at libremir.placard.fr.eu.org
Sun Mar 7 11:45:07 CET 2010


Author: cbayle
Date: 2010-03-07 11:45:07 +0100 (Sun, 07 Mar 2010)
New Revision: 8983

Modified:
   trunk/tools/simple-cdd/Makefile
   trunk/tools/simple-cdd/profiles/fusionforge.description
   trunk/tools/simple-cdd/profiles/fusionforge.packages
   trunk/tools/simple-cdd/profiles/templates/fusionforge.preseed
Log:
Add x-basic,x-gnome,autopart config option


Modified: trunk/tools/simple-cdd/Makefile
===================================================================
--- trunk/tools/simple-cdd/Makefile	2010-03-06 17:56:32 UTC (rev 8982)
+++ trunk/tools/simple-cdd/Makefile	2010-03-07 10:45:07 UTC (rev 8983)
@@ -2,12 +2,14 @@
 DIST=lenny
 DIST=squeeze
 
-default: fusionforge
+default: fusionforgemulti
 
-fusionforge: clean /usr/bin/build-simple-cdd profiles/fusionforge.conf  profiles/fusionforge.preseed
-	[ ! -r /var/cache/debconf/passwords.dat ] && ( sudo chgrp $(USRGRP) /var/cache/debconf/passwords.dat ; sudo chmod g+r /var/cache/debconf/passwords.dat ) || true
+fusionforge: clean passsetup /usr/bin/build-simple-cdd profiles/fusionforge.conf  profiles/fusionforge.preseed
 	build-simple-cdd -g --profiles fusionforge --auto-profiles fusionforge --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) 
 
+fusionforgemulti: clean passsetup /usr/bin/build-simple-cdd profiles/fusionforge.conf  profiles/fusionforge.preseed
+	build-simple-cdd -g --profiles fusionforge,x-basic,x-gnome,autopart --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) 
+
 fusionforgefr: clean /usr/bin/build-simple-cdd profiles/fusionforge.conf  profiles/fusionforge.preseed.fr
 	build-simple-cdd -g --profiles fusionforge --auto-profiles fusionforge --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) --locale fr_FR --force-preseed --keyboard fr-latin9
 
@@ -22,6 +24,9 @@
 	cat profiles/templates/fusionforge.preseed.fr | sed 's/%DIST%/$(DIST)/g' > $@
 	cd profiles ; ln -s fusionforge.preseed.fr fusionforge.preseed
 
+passsetup:
+	[ ! -r /var/cache/debconf/passwords.dat ] && ( sudo chgrp $(USRGRP) /var/cache/debconf/passwords.dat ; sudo chmod g+r /var/cache/debconf/passwords.dat ) || true
+
 clean:
 	rm -f profiles/fusionforge.conf profiles/fusionforge.preseed profiles/templates/fusionforge.preseed.fr
 

Modified: trunk/tools/simple-cdd/profiles/fusionforge.description
===================================================================
--- trunk/tools/simple-cdd/profiles/fusionforge.description	2010-03-06 17:56:32 UTC (rev 8982)
+++ trunk/tools/simple-cdd/profiles/fusionforge.description	2010-03-07 10:45:07 UTC (rev 8983)
@@ -1 +1 @@
-FusionForge 5.0 install
+FusionForge 5.0

Modified: trunk/tools/simple-cdd/profiles/fusionforge.packages
===================================================================
--- trunk/tools/simple-cdd/profiles/fusionforge.packages	2010-03-06 17:56:32 UTC (rev 8982)
+++ trunk/tools/simple-cdd/profiles/fusionforge.packages	2010-03-07 10:45:07 UTC (rev 8983)
@@ -1,4 +1,25 @@
 # less is more intuituve
 less
-# htop too
+# htop too some other goodees
 htop
+vim
+sudo
+# 
+ntpdate
+ntp
+# for the forge
+exim4-daemon-heavy
+mailman
+#proftpd # not in squeeze
+apache2-mpm-prefork
+openssl
+openssh-server
+# devel
+build-essential
+debconf-utils
+devscripts
+fakeroot
+svn-buildpackage
+dpatch
+debhelper
+reprepro

Modified: trunk/tools/simple-cdd/profiles/templates/fusionforge.preseed
===================================================================
--- trunk/tools/simple-cdd/profiles/templates/fusionforge.preseed	2010-03-06 17:56:32 UTC (rev 8982)
+++ trunk/tools/simple-cdd/profiles/templates/fusionforge.preseed	2010-03-07 10:45:07 UTC (rev 8983)
@@ -207,19 +207,19 @@
 #d-i passwd/make-user boolean false
 
 # Root password, either in clear text
-#CDD#d-i passwd/root-password password gforge
-#CDD#d-i passwd/root-password-again password gforge
+#d-i passwd/root-password password ff
+#d-i passwd/root-password-again password ff
 # or encrypted using an MD5 hash.
-#d-i passwd/root-password-crypted password [MD5 hash]
+d-i passwd/root-password-crypted password **LCK**
 
 # To create a normal user account.
 d-i passwd/user-fullname string FusionForge Debian User
 d-i passwd/username string ffuser
 # Normal user's password, either in clear text
-#CDD#d-i passwd/user-password password gfuser
-#CDD#d-i passwd/user-password-again password gfuser
+d-i passwd/user-password password ffuser
+d-i passwd/user-password-again password ffuser
 # or encrypted using an MD5 hash.
-d-i passwd/user-password-crypted password **LCK**
+#d-i passwd/user-password-crypted password [MD5 hash]
 
 ### Base system installation
 # Select the initramfs generator used to generate the initrd for 2.6 kernels.
@@ -260,9 +260,10 @@
 
 
 # Individual additional packages to install
-d-i pkgsel/include string vim ntpdate ntp build-essential debconf-utils \
-exim4-daemon-heavy mailman proftpd apache2-mpm-prefork openssl \
-sudo devscripts fakeroot svn-buildpackage dpatch debhelper reprepro openssh-server
+# I put them in .packages file
+#d-i pkgsel/include string vim ntpdate ntp build-essential debconf-utils \
+#exim4-daemon-heavy mailman proftpd apache2-mpm-prefork openssl \
+#sudo devscripts fakeroot svn-buildpackage dpatch debhelper reprepro openssh-server
 
 # Some versions of the installer can report back on what software you have
 # installed, and what software you use. The default is not to report back,
@@ -289,16 +290,16 @@
 #xserver-xorg xserver-xorg/autodetect_mouse boolean true
 
 # Monitor autodetection is recommended.
-xserver-xorg xserver-xorg/autodetect_monitor boolean true
+#XORG#xserver-xorg xserver-xorg/autodetect_monitor boolean true
 # Uncomment if you have an LCD display.
 #xserver-xorg xserver-xorg/config/monitor/lcd boolean true
 # X has three configuration paths for the monitor. Here's how to preseed
 # the "medium" path, which is always available. The "simple" path may not
 # be available, and the "advanced" path asks too many questions.
-xserver-xorg xserver-xorg/config/monitor/selection-method \
-       select medium
-xserver-xorg xserver-xorg/config/monitor/mode-list \
-       select 1024x768 @ 60 Hz
+#XORG#xserver-xorg xserver-xorg/config/monitor/selection-method \
+#XORG#       select medium
+#XORG#xserver-xorg xserver-xorg/config/monitor/mode-list \
+#XORG#       select 1024x768 @ 60 Hz
 
 ### Preseeding other packages
 # Depending on what software you choose to install, or if things go wrong
@@ -362,5 +363,6 @@
 in-target ln -s /var/lib/gforge/chroot/scmrepo /scmrepo ; \
 echo 'SYSLOGD="-p /dev/log -a /var/lib/gforge/chroot/dev/log"' >> /target/etc/default/syslogd ; \
 echo '/var/run/postgresql /var/lib/gforge/chroot/var/run/postgresql none bind' >> /target/etc/fstab ; \
+echo 'ffuser ALL = NOPASSWD: ALL' >> /target/etc/sudoers ; \
 echo 'syntax on' >> /target/etc/vim/vimrc.local ;
 




More information about the Fusionforge-commits mailing list