[Fusionforge-commits] r9123 - in branches/Branch_5_0/tools/simple-cdd: . profiles

Christian Bayle cbayle at libremir.placard.fr.eu.org
Tue Mar 16 23:54:48 CET 2010


Author: cbayle
Date: 2010-03-16 23:54:48 +0100 (Tue, 16 Mar 2010)
New Revision: 9123

Added:
   branches/Branch_5_0/tools/simple-cdd/profiles/autopart.description
   branches/Branch_5_0/tools/simple-cdd/profiles/autopart.preseed
   branches/Branch_5_0/tools/simple-cdd/profiles/default.downloads
   branches/Branch_5_0/tools/simple-cdd/profiles/default.packages
   branches/Branch_5_0/tools/simple-cdd/profiles/default.preseed
   branches/Branch_5_0/tools/simple-cdd/profiles/default.udebs
   branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.description
   branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.downloads
   branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.packages
   branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.description
   branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.packages
   branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.preseed
Modified:
   branches/Branch_5_0/tools/simple-cdd/Makefile
   branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.conf
   branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.description
   branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.downloads
   branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.packages
   branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.preseed
Log:
Merge from trunk


Modified: branches/Branch_5_0/tools/simple-cdd/Makefile
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/Makefile	2010-03-16 22:54:12 UTC (rev 9122)
+++ branches/Branch_5_0/tools/simple-cdd/Makefile	2010-03-16 22:54:48 UTC (rev 9123)
@@ -2,28 +2,19 @@
 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: passsetup /usr/bin/build-simple-cdd 
 	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) 
 
-fusionforgefr: clean /usr/bin/build-simple-cdd profiles/fusionforge.conf  profiles/fusionforge.preseed.fr
+fusionforgemulti: passsetup /usr/bin/build-simple-cdd
+	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
 	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
 
-profiles/fusionforge.conf: profiles/templates/fusionforge.conf
-	cat profiles/templates/fusionforge.conf | sed 's/%DIST%/$(DIST)/g' > $@
+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
 
-
-profiles/fusionforge.preseed: profiles/templates/fusionforge.preseed
-	cat profiles/templates/fusionforge.preseed | sed 's/%DIST%/$(DIST)/g' > $@
-
-profiles/fusionforge.preseed.fr: profiles/templates/fusionforge.preseed.fr
-	cat profiles/templates/fusionforge.preseed.fr | sed 's/%DIST%/$(DIST)/g' > $@
-	cd profiles ; ln -s fusionforge.preseed.fr fusionforge.preseed
-
-clean:
-	rm -f profiles/fusionforge.conf profiles/fusionforge.preseed profiles/templates/fusionforge.preseed.fr
-
 /usr/bin/build-simple-cdd:
 	sudo apt-get install simple-cdd

Added: branches/Branch_5_0/tools/simple-cdd/profiles/autopart.description
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/autopart.description	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/autopart.description	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1 @@
+Auto partitionning (Be carefull, reformat and take all disk)

Added: branches/Branch_5_0/tools/simple-cdd/profiles/autopart.preseed
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/autopart.preseed	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/autopart.preseed	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1 @@
+d-i partman/confirm     boolean true

Added: branches/Branch_5_0/tools/simple-cdd/profiles/default.downloads
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/default.downloads	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/default.downloads	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1,34 @@
+# keep grub or debian-installer may not work properly.
+grub
+
+popularity-contest
+localization-config
+console-tools
+
+usbutils
+acpi
+acpid
+eject
+
+# needed for debian-installer's LVM, software RAID or encrypted disks:
+lvm2
+mdadm
+cryptsetup
+
+# to support reiserfs, JFS and XFS filesystems
+reiserfsprogs
+jfsutils
+xfsprogs
+
+# type-handling tiny package needed for xorg on most architectures
+type-handling
+
+# debian-cd uses debootstrap from the mirror
+debootstrap
+
+# initramfs-tools recommends busybox, and we don't yet support recommends
+busybox
+
+# newer debian-cd (0.3.5+) requires syslinux-common or syslinux in the mirror
+syslinux-common
+syslinux

Added: branches/Branch_5_0/tools/simple-cdd/profiles/default.packages
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/default.packages	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/default.packages	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1,2 @@
+# less is more intuituve
+less

Added: branches/Branch_5_0/tools/simple-cdd/profiles/default.preseed
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/default.preseed	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/default.preseed	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1,188 @@
+# these are the basic debconf pre-seeding items needed for a miminal
+# interaction debian etch install using debian-installer
+
+# this example pre-seeding file was largely based on
+# http://d-i.alioth.debian.org/manual/example-preseed.txt
+#
+# for more explanation of the options, see:
+# http://d-i.alioth.debian.org/manual/en.mips/apbs04.html
+
+## simple-cdd options
+
+# automatically select simple-cdd profiles
+# NOTE: profile "default" is now automatically included, and should not be
+# specified here.
+#simple-cdd simple-cdd/profiles multiselect ltsp
+#simple-cdd simple-cdd/profiles multiselect ltsp, x-basic
+
+
+###### Package selection.
+
+# You can choose to install any combination of tasks that are available.
+# Available tasks as of this writing include: Desktop environment,
+# Web server, Print server, DNS server, File server, Mail server, 
+# SQL database, manual package selection. The last of those will run
+# aptitude. You can also choose to install no tasks, and force the
+# installation of a set of packages in some other way.
+
+# don't install any tasks
+tasksel   tasksel/first multiselect 
+#tasksel   tasksel/first multiselect Desktop environment
+#tasksel  tasksel/first multiselect Web server, Mail server, DNS server
+
+
+###### Time zone setup.
+
+# Controls whether or not the hardware clock is set to UTC.
+d-i clock-setup/utc boolean true
+
+# Many countries have only one time zone. If you told the installer you're
+# in one of those countries, you can choose its standard time zone via this
+# question.
+base-config tzconfig/choose_country_zone_single boolean true
+#d-i     time/zone       select  US/Pacific
+
+
+### keyboard configuration
+
+# don't mess with the keymap
+console-common  console-data/keymap/policy      select  Don't touch keymap
+console-data    console-data/keymap/policy      select  Don't touch keymap
+
+# keyboard layouts
+#console-data console-data/keymap/qwerty/layout select US american
+#console-data console-data/keymap/family select qwerty
+#console-common console-data/keymap/family select qwerty
+
+
+###### Account setup.
+
+# To preseed the root password, you have to put it in the clear in this
+# file. That is not a very good idea, use caution!
+#passwd   passwd/root-password    password r00tme
+#passwd   passwd/root-password-again  password r00tme
+
+# If you want to skip creation of a normal user account.
+#passwd   passwd/make-user    boolean false
+# Alternatively, you can preseed the user's name and login.
+#passwd   passwd/user-fullname    string Debian User
+#passwd   passwd/username     string debian
+# And their password, but use caution!
+#passwd   passwd/user-password    password insecure
+#passwd   passwd/user-password-again  password insecure
+
+
+#### Network configuration.
+
+# netcfg will choose an interface that has link if possible. This makes it
+# skip displaying a list if there is more than one interface.
+d-i netcfg/choose_interface select auto
+
+# Note that any hostname and domain names assigned from dhcp take
+# precidence over values set here. However, setting the values still
+# prevents the questions from being shown even if values come from dhcp.
+d-i netcfg/get_hostname string unassigned
+d-i netcfg/get_domain string unassigned
+# to set the domain to empty:
+#d-i netcfg/get_domain string 
+
+# Disable that annoying WEP key dialog.
+d-i netcfg/wireless_wep string 
+
+
+### Partitioning.
+
+# you can specify a disk to partition. The device name can be given in either
+# devfs or traditional non-devfs format.  For example, to use the first disk
+# devfs knows of:
+## NOTE: disabled for lenny, as it seemed to cause issues
+#d-i partman-auto/disk string /dev/discs/disc0/disc
+
+# In addition, you'll need to specify the method to use.
+# The presently available methods are: "regular", "lvm" and "crypto"
+d-i partman-auto/method string regular
+
+# If one of the disks that are going to be automatically partitioned
+# contains an old LVM configuration, the user will normally receive a
+# warning. This can be preseeded away...
+#d-i partman-auto/purge_lvm_from_device boolean true
+# And the same goes for the confirmation to write the lvm partitions.
+#d-i partman-lvm/confirm boolean true
+
+# Alternately, If the system has free space you can choose to only partition
+# that space.
+#d-i  partman-auto/init_automatically_partition select Use the largest continuous free space
+#d-i partman-auto/init_automatically_partition       select  Guided - use entire disk
+
+# You can choose from any of the predefined partitioning recipes:
+d-i partman-auto/choose_recipe  select All files in one partition (recommended for new users)
+#d-i  partman-auto/choose_recipe  select Desktop machine
+#d-i  partman-auto/choose_recipe  select Multi-user workstation
+
+# uncomment the following three values to makes partman automatically partition
+# without confirmation.
+#d-i partman/confirm_write_new_label boolean true
+d-i partman/choose_partition  select Finish partitioning and write changes to disk
+#d-i partman/confirm     boolean true
+
+#### Boot loader installation.
+
+# This is fairly safe to set, it makes grub install automatically to the MBR
+# if no other operating system is detected on the machine.
+d-i grub-installer/only_debian  boolean true
+# This one makes grub-installer install to the MBR if if finds some other OS
+# too, which is less safe as it might not be able to boot that other OS.
+d-i grub-installer/with_other_os  boolean true
+
+
+###### Apt setup.
+
+# automatically set the CD as the installation media.
+#base-config apt-setup/uri_type  select http
+#base-config apt-setup/uri_type  select cdrom
+# only scan the first CD by default
+#base-config apt-setup/cd/another  boolean false
+# don't ask to use additional mirrors
+#base-config apt-setup/another boolean false
+# Use a network mirror?
+# apt-mirror-setup        apt-setup/use_mirror    boolean false
+
+# Do enable security updates.
+#base-config apt-setup/security-updates  boolean true
+
+# You can choose to install non-free and contrib software.
+#d-i apt-setup/non-free  boolean true
+#d-i apt-setup/contrib boolean true
+
+
+###### Mailer configuration.
+
+# During a normal install, exim asks only two questions. Here's how to
+# avoid even those. More complicated preseeding is possible.
+exim4-config  exim4/dc_eximconfig_configtype  select no configuration at this time
+# It's a good idea to set this to whatever user account you choose to
+# create. Leaving the value blank results in postmaster mail going to
+# /var/mail/mail.
+exim4-config  exim4/dc_postmaster   string 
+
+
+### skip some annoying installation status notes
+
+# Avoid that last message about the install being complete.
+d-i finish-install/reboot_in_progress note
+# Avoid the introductory message.
+base-config base-config/intro note 
+# Avoid the final message.
+base-config base-config/login note 
+
+#d-i     popularity-contest/participate  boolean false
+
+
+### simple-cdd commands
+
+# you may add to the following commands by including a ";" followed by your
+# shell commands.
+
+# loads the simple-cdd-profiles udeb to which asks for which profiles to use,
+# load the debconf preseeding and queue packages for installation.
+d-i preseed/early_command string anna-install simple-cdd-profiles

Added: branches/Branch_5_0/tools/simple-cdd/profiles/default.udebs
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/default.udebs	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/default.udebs	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1,2 @@
+# the udeb needed for simple-cdd
+simple-cdd-profiles

Modified: branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.conf
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.conf	2010-03-16 22:54:12 UTC (rev 9122)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.conf	2010-03-16 22:54:48 UTC (rev 9123)
@@ -1,5 +1,5 @@
 
-export CODENAME="%DIST%"
+export CODENAME="squeeze"
 export DEBVERSION="fusionforge"
 export OFFICIAL="FusionForge50"
 export OFFICIAL_VAL=0

Modified: branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.description
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.description	2010-03-16 22:54:12 UTC (rev 9122)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.description	2010-03-16 22:54:48 UTC (rev 9123)
@@ -1 +1 @@
-FusionForge 5.0 install
+FusionForge 5.0

Modified: branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.downloads
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.downloads	2010-03-16 22:54:12 UTC (rev 9122)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.downloads	2010-03-16 22:54:48 UTC (rev 9123)
@@ -41,7 +41,7 @@
 debconf-utils
 exim4-daemon-heavy
 mailman
-proftpd
+#proftpd
 apache2-mpm-prefork
 openssl
 zsh

Modified: branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.packages
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.packages	2010-03-16 22:54:12 UTC (rev 9122)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.packages	2010-03-16 22:54:48 UTC (rev 9123)
@@ -1,4 +1,26 @@
 # less is more intuituve
 less
-# htop too
+# htop too some other goodees
 htop
+vim
+sudo
+#zsh
+# 
+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: branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.preseed
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.preseed	2010-03-16 22:54:12 UTC (rev 9122)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/fusionforge.preseed	2010-03-16 22:54:48 UTC (rev 9123)
@@ -1,149 +1,14 @@
-### Contents of the preconfiguration file
-### Localization
 # SEE http://www.debian.org/releases/squeeze/example-preseed.txt
-# Locale sets language and country.
-#INTL#d-i debian-installer/country string FR
-#INTL#d-i debian-installer/locale string fr_FR.UTF-8
-
-# Keyboard selection.
-#d-i console-tools/archs select at
-#INTL#d-i console-keymaps-at/keymap select fr-latin9
-# Example for a different keyboard architecture
-#d-i console-keymaps-usb/keymap select mac-usb-us
-
-### Network configuration
-# netcfg will choose an interface that has link if possible. This makes it
-# skip displaying a list if there is more than one interface.
-d-i netcfg/choose_interface select auto
-
-# To pick a particular interface instead:
-#d-i netcfg/choose_interface select eth1
-
-# If you have a slow dhcp server and the installer times out waiting for
-# it, this might be useful.
-#d-i netcfg/dhcp_timeout string 60
-
-# If you prefer to configure the network manually, uncomment this line and
-# the static network configuration below.
-#d-i netcfg/disable_dhcp boolean true
-
-# If you want the preconfiguration file to work on systems both with and
-# without a dhcp server, uncomment these lines and the static network
-# configuration below.
-#d-i netcfg/dhcp_failed note
-#d-i netcfg/dhcp_options select Configure network manually
-
-# Static network configuration.
-#d-i netcfg/get_nameservers string 192.168.1.1
-#d-i netcfg/get_ipaddress string 192.168.1.42
-#d-i netcfg/get_netmask string 255.255.255.0
-#d-i netcfg/get_gateway string 192.168.1.1
-#d-i netcfg/confirm_static boolean true
-
-# Any hostname and domain names assigned from dhcp take precedence over
-# values set here. However, setting the values still prevents the questions
-# from being shown, even if values come from dhcp.
 d-i netcfg/get_hostname string myforge
 d-i netcfg/get_domain string mytld
 
-# Disable that annoying WEP key dialog.
-d-i netcfg/wireless_wep string
-# The wacky dhcp hostname that some ISPs use as a password of sorts.
-#d-i netcfg/dhcp_hostname string radish
-
-### Mirror settings
-# If you select ftp, the mirror/country string does not need to be set.
-#d-i mirror/protocol string ftp
-#CDD#d-i mirror/country string enter information manually
-#CDD#d-i mirror/http/hostname string 192.168.0.218
-#CDD#d-i mirror/http/directory string /debian
-#CDD#d-i mirror/http/proxy string
-
-# Suite to install.
-#d-i mirror/suite string testing
-# Suite to use for loading installer components (optional).
-#d-i mirror/udeb/suite string testing
-
-### Partitioning
-# If the system has free space you can choose to only partition that space.
-# Note: this must be preseeded with a localized (translated) value.
-#d-i partman-auto/init_automatically_partition \
-#      select Guided - use the largest continuous free space
-
-# Alternatively, you can specify a disk to partition. The device name
-# can be given in either devfs or traditional non-devfs format.
-# For example, to use the first disk:
-#d-i partman-auto/disk string /dev/discs/disc0/disc
-#CDD#d-i partman-auto/disk string /dev/hda
-# In addition, you'll need to specify the method to use.
-# The presently available methods are: "regular", "lvm" and "crypto"
-#NOAUTOPART#d-i partman-auto/method string regular
-
-# If one of the disks that are going to be automatically partitioned
-# contains an old LVM configuration, the user will normally receive a
-# warning. This can be preseeded away...
-#NOAUTOPART#d-i partman-auto/purge_lvm_from_device boolean true
-# And the same goes for the confirmation to write the lvm partitions.
-#NOAUTOPART#d-i partman-lvm/confirm boolean true
-
-# You can choose from any of the predefined partitioning recipes.
-# Note: this must be preseeded with a localized (translated) value.
-#NOAUTOPART#d-i partman-auto/choose_recipe \
-#NOAUTOPART#       select All files in one partition (recommended for new users)
-#d-i partman-auto/choose_recipe \
-#       select Separate /home partition
-#d-i partman-auto/choose_recipe \
-#       select Separate /home, /usr, /var, and /tmp partitions
-
-# Or provide a recipe of your own...
-# The recipe format is documented in the file devel/partman-auto-recipe.txt.
-# If you have a way to get a recipe file into the d-i environment, you can
-# just point at it.
-#d-i partman-auto/expert_recipe_file string /hd-media/recipe
-
-# If not, you can put an entire recipe into the preconfiguration file in one
-# (logical) line. This example creates a small /boot partition, suitable
-# swap, and uses the rest of the space for the root partition:
-#d-i partman-auto/expert_recipe string                         \
-#      boot-root ::                                            \
-#              40 50 100 ext3                                  \
-#                      $primary{ } $bootable{ }                \
-#                      method{ format } format{ }              \
-#                      use_filesystem{ } filesystem{ ext3 }    \
-#                      mountpoint{ /boot }                     \
-#              .                                               \
-#              500 10000 1000000000 ext3                       \
-#                      method{ format } format{ }              \
-#                      use_filesystem{ } filesystem{ ext3 }    \
-#                      mountpoint{ / }                         \
-#              .                                               \
-#              64 512 300% linux-swap                          \
-#                      method{ swap } format{ }                \
-#              .
-
-# This makes partman automatically partition without confirmation.
-#NOAUTOPART#d-i partman/confirm_write_new_label boolean true
-#NOAUTOPART#d-i partman/choose_partition \
-#NOAUTOPART#       select Finish partitioning and write changes to disk
-#NOAUTOPART#d-i partman/confirm boolean true
-
-### Clock and time zone setup
-# Controls whether or not the hardware clock is set to UTC.
-d-i clock-setup/utc boolean true
-
 # You may set this to any valid setting for $TZ; see the contents of
 # /usr/share/zoneinfo/ for valid values.
 d-i time/zone string Europe/Paris
 
-### Apt setup
-# You can choose to install non-free and contrib software.
-#d-i apt-setup/non-free boolean true
-#d-i apt-setup/contrib boolean true
 # Uncomment this if you don't want to use a network mirror.
 d-i apt-setup/use_mirror boolean false
-# Uncomment this to avoid adding security sources, or
-# add a hostname to use a different server than security.debian.org.
-#CDD#d-i apt-setup/security_host string 192.168.0.218/debian-security
+
 # Select which update services to use; define the mirrors to be used.
 # Values shown below are the normal defaults.
 #d-i apt-setup/services-select multiselect security, volatile
@@ -152,34 +17,7 @@
 #d-i apt-setup/volatile_host string volatile.debian.org
 
 
-# Additional repositories, local[0-9] available
-#d-i apt-setup/local0/repository string \
-#       http://local.server/debian stable main
-#d-i apt-setup/local0/repository string http://localhost/debian-local etch main
-#d-i apt-setup/local0/repository string http://gforge.eu/debian etch main
-#MIR#d-i apt-setup/local0/repository string http://debian.fusionforge.org/debian %DIST% main
-#d-i apt-setup/local0/comment string local server
-# Enable deb-src lines
-#d-i apt-setup/local0/source boolean true
-#MIR#d-i apt-setup/local0/source boolean true
-# URL to the public key of the local repository; you must provide a key or
-# apt will complain about the unauthenticated repository and so the
-# sources.list line will be left commented out
-#d-i apt-setup/local0/key string http://local.server/key
-#d-i apt-setup/local0/key string http://localhost/debian-local/key
-#d-i apt-setup/local0/key string http://gforge.eu/key
-#MIR#d-i apt-setup/local0/key string http://debian.fusionforge.org/key
-
-#MIR#d-i apt-setup/local1/repository string http://ftp2.fr.debian.org/debian %DIST% main
-#MIR#d-i apt-setup/local1/source boolean true
-# By default the installer requires that repositories be authenticated
-# using a known gpg key. This setting can be used to disable that
-# authentication. Warning: Insecure, not recommended.
-#d-i debian-installer/allow_unauthenticated string true
-#d-i debian-installer/allow_unauthenticated string true
-
 ###### Apt setup.
-
 # automatically set the CD as the installation media.
 #base-config apt-setup/uri_type  select http
 base-config apt-setup/uri_type  select cdrom
@@ -190,15 +28,6 @@
 # Use a network mirror?
 apt-mirror-setup        apt-setup/use_mirror    boolean false
 
-# Do enable security updates.
-#base-config apt-setup/security-updates  boolean true
-
-# You can choose to install non-free and contrib software.
-#d-i apt-setup/non-free  boolean true
-#d-i apt-setup/contrib boolean true
-
-
-
 ### Account setup
 # Skip creation of a root account (normal user account will be able to
 # use sudo).
@@ -207,108 +36,27 @@
 #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.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird
-
-### Boot loader installation
-# Grub is the default boot loader (for x86). If you want lilo installed
-# instead, uncomment this:
-#d-i grub-installer/skip boolean true
-
-# This is fairly safe to set, it makes grub install automatically to the MBR
-# if no other operating system is detected on the machine.
-d-i grub-installer/only_debian boolean true
-
-# This one makes grub-installer install to the MBR if it also finds some other
-# OS, which is less safe as it might not be able to boot that other OS.
-d-i grub-installer/with_other_os boolean true
-
-# Alternatively, if you want to install to a location other than the mbr,
-# uncomment and edit these lines:
-#d-i grub-installer/only_debian boolean false
-#d-i grub-installer/with_other_os boolean false
-#d-i grub-installer/bootdev  string (hd0,0)
-# To install grub to multiple disks:
-#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)
-
-### Package selection
-#tasksel tasksel/first multiselect standard, web-server
-
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde-desktop, xfce-desktop
-
-
 #tasksel tasksel/first multiselect standard, kde-desktop
 #tasksel tasksel/first multiselect standard, gnome-desktop
 tasksel tasksel/first multiselect standard
 
-
-# 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
-
-# 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,
-# but sending reports helps the project determine what software is most
 # popular and include it on CDs.
 popularity-contest popularity-contest/participate boolean false
 
-### Finishing up the first stage install
-# Avoid that last message about the install being complete.
-d-i finish-install/reboot_in_progress note
-
-# This will prevent the installer from ejecting the CD during the reboot,
-# which is useful in some situations.
-#d-i cdrom-detect/eject boolean false
-
-### X configuration
-# X can detect the right driver for some cards, but if you're preseeding,
-# you override whatever it chooses. Still, vesa will work most places.
-#xserver-xorg xserver-xorg/config/device/driver select vesa
-
-# A caveat with mouse autodetection is that if it fails, X will retry it
-# over and over. So if it's preseeded to be done, there is a possibility of
-# an infinite loop if the mouse is not autodetected.
-#xserver-xorg xserver-xorg/autodetect_mouse boolean true
-
-# Monitor autodetection is recommended.
-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
-
-### Preseeding other packages
-# Depending on what software you choose to install, or if things go wrong
-# during the installation process, it's possible that other questions may
-# be asked. You can preseed those too, of course. To get a list of every
-# possible question that could be asked during an install, do an
-# installation, and then run these commands:
-#   debconf-get-selections --installer > file
-#   debconf-get-selections >> file
-
 # Mailman
 mailman	mailman/queue_files_present	note	
 mailman	mailman/default_server_language	select	fr
@@ -316,20 +64,23 @@
 mailman	mailman/site_languages	multiselect	en,ru,fr
 mailman	mailman/used_languages	string	
 mailman	mailman/create_site_list	note
+
 # Courier base
 courier-base courier-base/maildir	string	Maildir
 courier-base courier-base/webadmin-configmode	boolean	false
+
 # Proftpd
 proftpd	shared/proftpd/inetd_or_standalone	select	standalone
-# GForge
-#CDD#gforge-db-postgresql gforge/shared/admin_password password gforge
-#CDD#gforge-db-postgresql gforge/shared/admin_password_confirm password gforge
+
+# FusionForge
+#CDD#gforge-db-postgresql gforge/shared/admin_password password fforge
+#CDD#gforge-db-postgresql gforge/shared/admin_password_confirm password fforge
 gforge-db-postgresql	gforge/shared/db_host	string	localhost
 gforge-db-postgresql	gforge/shared/replace_file_remove	boolean	true
 gforge-web-apache	gforge/shared/replace_file_remove	boolean	true
 gforge-db-postgresql	gforge/shared/replace_file_install	boolean	true
 gforge-web-apache	gforge/shared/replace_file_install	boolean	true
-#gforge-web-apache	gforge/shared/ip_address		string	192.168.0.47
+
 # UCF
 ucf ucf/changeprompt select install_new
 
@@ -362,5 +113,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 ;
 

Added: branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.description
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.description	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.description	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1 @@
+very basic X.org system with window manager and console

Added: branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.downloads
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.downloads	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.downloads	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1,2 @@
+# provides "not+sparc" dependency for xorg
+type-handling

Added: branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.packages
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.packages	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/x-basic.packages	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1,22 @@
+# window manager
+icewm
+
+# x-teminal-emulator
+rxvt-unicode
+
+# menus up to date
+menu
+
+# login manager
+xdm
+
+# includes startx
+xbase-clients
+
+# X
+#xorg
+xserver-xorg
+
+# workaround http://bugs.debian.org/405639
+xserver-xorg-input-all
+xserver-xorg-video-all

Added: branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.description
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.description	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.description	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1 @@
+Gnome Desktop

Added: branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.packages
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.packages	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.packages	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1,27 @@
+# window manager
+gnome-desktop-environment
+
+# x-teminal-emulator
+gnome-terminal
+
+# menus up to date
+menu
+
+# login manager
+gdm
+
+# includes startx
+xbase-clients
+
+# X
+#xorg
+xserver-xorg
+
+# workaround http://bugs.debian.org/405639
+xserver-xorg-input-all
+xserver-xorg-video-all
+
+# browser
+iceweasel
+# mailer
+icedove

Added: branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.preseed
===================================================================
--- branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.preseed	                        (rev 0)
+++ branches/Branch_5_0/tools/simple-cdd/profiles/x-gnome.preseed	2010-03-16 22:54:48 UTC (rev 9123)
@@ -0,0 +1 @@
+tasksel tasksel/first multiselect standard, gnome-desktop




More information about the Fusionforge-commits mailing list