[debian-edu-commits] debian-edu/ 01/03: Overall white-space cleanup on all files in this package (strip white- spaces at EOL).

Mike Gabriel sunweaver at debian.org
Mon Aug 21 18:28:51 UTC 2017


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-install.

commit 4d14fdd1e4c00ebb741f3f9148a9226c6b449c26
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 21 14:23:54 2017 -0400

    Overall white-space cleanup on all files in this package (strip white- spaces at EOL).
---
 Makefile                                           |  4 ++--
 apt-setup/generators/70debian-edu-install          |  6 +++---
 base-installer                                     |  2 +-
 debian-edu-profile                                 | 20 ++++++++++----------
 debian/changelog                                   | 19 ++++++++++++-------
 debian/debian-edu-install.postinst                 |  4 ++--
 .../debian-edu-install.xdebian-edu-firstboot.init  |  2 +-
 debian/debian-edu-profile-udeb.templates           |  4 ++--
 lib/partman/commit.d/90debian-edu-mountoptions     | 10 +++++-----
 lib/partman/common/94edultsp                       | 22 +++++++++++-----------
 lib/partman/common/96eduwork                       | 16 ++++++++--------
 lib/partman/common/98edustandalone                 | 16 ++++++++--------
 .../recipes-powerpc-powermac_newworld/94edultsp    | 22 +++++++++++-----------
 .../recipes-powerpc-powermac_newworld/96eduwork    | 16 ++++++++--------
 .../98edustandalone                                | 16 ++++++++--------
 lib/partman/recipes-powerpc-prep/94edultsp         | 22 +++++++++++-----------
 lib/partman/recipes-powerpc-prep/96eduwork         | 16 ++++++++--------
 lib/partman/recipes-powerpc-prep/98edustandalone   | 16 ++++++++--------
 lib/partman/recipes/94edultsp                      | 22 +++++++++++-----------
 lib/partman/recipes/96eduwork                      | 16 ++++++++--------
 lib/partman/recipes/98edustandalone                | 16 ++++++++--------
 preseed-values/defaults.README                     |  2 +-
 preseed-values/defaults.main-server                |  2 +-
 preseed-values/defaults.networked                  |  2 +-
 24 files changed, 149 insertions(+), 144 deletions(-)

diff --git a/Makefile b/Makefile
index 3849efb..06d4b9a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ DEFAULTS = \
 all: check
 check: update-partman-recipes check-scripts # check-defaults
 
-install: 
+install:
 	for profile in $(DEFAULTS) ; do \
 	    $(INSTALL_DATA) preseed-values/defaults.$$profile $(DESTDIR)$(pkglibdir)/; \
 	done
@@ -90,7 +90,7 @@ minimum-diskreq:
 status:
 	for f in debian/po/*.po; do \
 		echo -n $$f:; LANG=C msgfmt --statistics -o /dev/null $$f 2>&1 ; \
-	done 
+	done
 dist:
 	debuild -us -uc
 
diff --git a/apt-setup/generators/70debian-edu-install b/apt-setup/generators/70debian-edu-install
index b501a6d..24e7e9f 100755
--- a/apt-setup/generators/70debian-edu-install
+++ b/apt-setup/generators/70debian-edu-install
@@ -45,7 +45,7 @@ else
 	log "Not touching volatile mirror settings, able to reach it using http/wget"
 fi
 
-# Fetch the mirror 
+# Fetch the mirror
 db_get mirror/http/hostname || true
 MIRROR=$RET
 
@@ -80,12 +80,12 @@ fi
 edu-etcvcs commit
 
 # We need to check for a local repository if we are using http as source
-if [ "$PROTOCOL" = "http" ] ; then 
+if [ "$PROTOCOL" = "http" ] ; then
     log "OK found http_protocol"
     db_get mirror/http/directory || true
     DIRECTORY="$RET"
     echo >> $file
-    if wget -qO - http://$MIRROR$DIRECTORY/dists/$codename/Release | grep -q " local/binary" ; then 
+    if wget -qO - http://$MIRROR$DIRECTORY/dists/$codename/Release | grep -q " local/binary" ; then
         log "OK, Found local/binary, adding local to $file"
         echo >> $file
         echo "deb http://$MIRROR$DIRECTORY $codename local" >> $file
diff --git a/base-installer b/base-installer
index b092cab..95b50a7 100755
--- a/base-installer
+++ b/base-installer
@@ -36,7 +36,7 @@ Acquire::http::Pipeline-Depth 0;
 EOF
 
 log "setting up aptkey"
-if [ -f /usr/share/keyrings/archive.gpg -a ! -f /target/etc/apt/trusted.gpg ] ; then 
+if [ -f /usr/share/keyrings/archive.gpg -a ! -f /target/etc/apt/trusted.gpg ] ; then
     log "creating /etc/apt in target"
     mkdir -p /target/etc/apt
     log "copying archive.gpg as trusted.gpg under /etc/apt in target"
diff --git a/debian-edu-profile b/debian-edu-profile
index a256899..7fcbbe5 100755
--- a/debian-edu-profile
+++ b/debian-edu-profile
@@ -41,7 +41,7 @@ ask_about_popcon() {
     db_settitle debian-edu-install/participate-popcon/title
     db_input critical "debian-edu-install/participate-popcon" || true
     log "do we want popcon?"
-    db_go || true 
+    db_go || true
     db_get "debian-edu-install/participate-popcon" || true
     if test "$RET" = true ; then
 	add_preseed popularity-contest popularity-contest/participate boolean true
@@ -282,18 +282,18 @@ automatic_partitioning() {
 		arch=
 		subarch=
 	;;
-	    "powerpc-powermac_newworld") #set 
+	    "powerpc-powermac_newworld") #set
 	    	arch=-powerpc
 		subarch=-powermac_newworld
 	;;
-	    "powerpc-prep") #set 
+	    "powerpc-prep") #set
 	    	arch=-powerpc
 		subarch=-prep
 	;;
 	    *)	#just in case
 		arch=
 		subarch=
-	;;    
+	;;
     esac
 
     case "$server-$workstation-$ltspserver-$standalone-$minimal-$roaming" in
@@ -364,7 +364,7 @@ automatic_partitioning() {
    # Disable in order to not lock up the installer, untill it's
    # reliable [Ronny Aasen 20080201]
    #db_set "partman-auto/disk" /dev/discs/disc0/disc
-   #and method lvm 
+   #and method lvm
    db_set "partman-auto/method" lvm
    db_fset "partman-auto/method" seen true || true
 
@@ -394,9 +394,9 @@ ask_about_popcon
 
 # any server
 case "$server" in
-    "true") 
-        # install exim4-daemon-heavy early. 
-	db_set "base-installer/includes" "exim4-daemon-heavy"	
+    "true")
+        # install exim4-daemon-heavy early.
+	db_set "base-installer/includes" "exim4-daemon-heavy"
 	;;
 esac
 
@@ -472,7 +472,7 @@ fi
 archstr=$(/bin/archdetect)
 if [ -f /cdrom/.disk/cd_type ] && egrep -iq 'dvd|bluray' /cdrom/.disk/cd_type; then
     #disable mirror usage if we install from dvd or the usb sticks
-    db_set "apt-setup/use_mirror" false 
+    db_set "apt-setup/use_mirror" false
     db_fset "apt-setup/use_mirror" seen true || true
     log "disabling mirror selection on dvd's"
 elif ! log-output wget -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://ftp.debian.org/debian/README ; then
@@ -509,7 +509,7 @@ if grep -iq 'priority' /proc/cmdline ; then
 else
     # Do not mess with priority if the user runs in expert mode.
     if [ false = "$expert" ] ; then
-        # Check if it runs at default value, and bump if it does. 
+        # Check if it runs at default value, and bump if it does.
         if db_get debconf/priority && [ "$RET" ] ; then
 	    if [ $RET == "high" ] ; then db_set "debconf/priority" "critical"; fi
         fi
diff --git a/debian/changelog b/debian/changelog
index 43bdba6..5f9acd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,19 @@
 debian-edu-install (1.917) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Bump Standards-Version to 4.0.1, no changes needed.
-  * Drop no longer active people from uploaders, thanks for all your work: 
+  * Drop no longer active people from uploaders, thanks for all your work:
     - Andrew Lee (李健秋).
   * debian-edu-install.postinst:
     - drop workaround for missing versions present between 1.810 and 1.813.
     - update version number in /etc/debian-edu/config on upgrades.
   * Bump version file to 10+edu0~a0 to reflect that we are working on Buster
     now.
-  * base-installer: drop code disabled since 2012. 
+  * base-installer: drop code disabled since 2012.
+
+  [ Mike Gabriel ]
+  * Overall white-space cleanup on all files in this package (strip white-
+    spaces at EOL).
 
  -- Holger Levsen <holger at debian.org>  Sat, 05 Aug 2017 17:58:22 -0400
 
@@ -96,7 +101,7 @@ debian-edu-install (1.909) unstable; urgency=medium
 debian-edu-install (1.908) unstable; urgency=medium
 
   * Rename thin-client-server profile to ltsp-server-profile.
-    (Closes: #588510) 
+    (Closes: #588510)
     Some occurrences of Thin-Client-Server are still left in the code to
     support upgrades of systems installed before Stretch.
   * Update, translate and (un)fuzzy translations of the debconf templates for
@@ -162,7 +167,7 @@ debian-edu-install (1.902) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
   * Adjust partion sizes (+4 GiB for /opt) in lib/partman/common like in
-    lib/partman/recipes to have enough space for LTSP NBD image file. 
+    lib/partman/recipes to have enough space for LTSP NBD image file.
   * Update after running update-partman-recipes.
   * Add forgotten type 'string' to fix grub preseeding (defaults.common).
 
@@ -192,7 +197,7 @@ debian-edu-install (1.900) unstable; urgency=medium
     alpha release.
   * debian/control:
     - Bump standards version to 3.9.8.
-    - Vcs-Browser: use /git/ in URL instead of /cgit/. 
+    - Vcs-Browser: use /git/ in URL instead of /cgit/.
 
  -- Holger Levsen <holger at debian.org>  Thu, 19 May 2016 00:50:20 +0200
 
@@ -1590,7 +1595,7 @@ debian-edu-install (1.508) unstable; urgency=low
     for Squeeze (Closes: #570772).
 
   [ Translations]
-  * Improve German (de) by Andreas B. Mundt. 	
+  * Improve German (de) by Andreas B. Mundt.
   * Updated Vietnamese from Clytie Siddall (Closes: #572771)
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 07 Apr 2010 21:15:56 +0200
@@ -1615,7 +1620,7 @@ debian-edu-install (1.507) unstable; urgency=low
   * Update Norwegian (nn) by Jan Roar Rød.
   * Update Basque (eu) by Iñaki Larrañaga Murgoitio. (Closes: #570217)
   * Add Slovak (sk) by Ivan Masár. (Closes: #570420)
-  * Polish German (de) by Andreas B. Mundt. 	
+  * Polish German (de) by Andreas B. Mundt.
   * Update Traditional Chinese (zh_TW) by Andrew Lee (李健秋).
   * Update Vietnamese (vi) by Clytie Siddall. (Closes:#569001)
   * Update Itaian (it) by Claudio Carboncini. (Closes:#564626)
diff --git a/debian/debian-edu-install.postinst b/debian/debian-edu-install.postinst
index b81caec..d79f7eb 100644
--- a/debian/debian-edu-install.postinst
+++ b/debian/debian-edu-install.postinst
@@ -93,8 +93,8 @@ if [ ! "$DEBIAN_HAS_FRONTEND" ]; then
     #  2 ltsp-server
     #  3 workstation
     #  4 networked (Common for non-standalone)
-    #  5 standalone 
-    #  6 barebone 
+    #  5 standalone
+    #  6 barebone
     if test "$standalone" = true ; then
 	load_defaults standalone
     fi
diff --git a/debian/debian-edu-install.xdebian-edu-firstboot.init b/debian/debian-edu-install.xdebian-edu-firstboot.init
index b4d288b..5be1597 100755
--- a/debian/debian-edu-install.xdebian-edu-firstboot.init
+++ b/debian/debian-edu-install.xdebian-edu-firstboot.init
@@ -84,7 +84,7 @@ do_start() {
     # debian-edu-config, this hook made it possible.
     if [ -x /usr/share/debian-edu-config/tools/run-at-firstboot ] ; then
 	log_begin_msg "Running debian-edu-config run-at-firstboot"
-	/usr/share/debian-edu-config/tools/run-at-firstboot 
+	/usr/share/debian-edu-config/tools/run-at-firstboot
 	log_end_msg 0 || true
     fi
 
diff --git a/debian/debian-edu-profile-udeb.templates b/debian/debian-edu-profile-udeb.templates
index 0d25883..da05d45 100644
--- a/debian/debian-edu-profile-udeb.templates
+++ b/debian/debian-edu-profile-udeb.templates
@@ -12,13 +12,13 @@ _Description: Profile(s) to apply to this machine:
  .
   - Main Server: reserved for the Debian Edu server. It does not
                  include any GUI (Graphical User Interface). There
-                 should only be one such server on a Debian Edu 
+                 should only be one such server on a Debian Edu
                  network.
   - Workstation: for normal machines on the Debian Edu network.
   - Roaming Workstation: for single user machines on the Debian Edu
                  network which some times travel outside the network.
   - LTSP Server:
-                 includes 'Workstation' and requires two network 
+                 includes 'Workstation' and requires two network
                  cards.
   - Standalone:  for machines meant to be used outside the Debian Edu
                  network. It includes a GUI and conflicts with other
diff --git a/lib/partman/commit.d/90debian-edu-mountoptions b/lib/partman/commit.d/90debian-edu-mountoptions
index 40fb041..46d365f 100755
--- a/lib/partman/commit.d/90debian-edu-mountoptions
+++ b/lib/partman/commit.d/90debian-edu-mountoptions
@@ -12,7 +12,7 @@ for dev in $DEVICES/*; do
         partitions="$partitions $id,$num"
     done
     close_dialog
-    
+
     for part in $partitions; do
         id=${part%,*}
         num=${part#*,}
@@ -21,12 +21,12 @@ for dev in $DEVICES/*; do
 	case $dev in
 	*skole+tjener+home0)
            logger -t debian-edu-install "enabling nosuid option for home0 partition"
-           mkdir -p $dev/$id/options 
-	   touch $dev/$id/options/nosuid 
-	   ls -l $dev/$id/options 
+           mkdir -p $dev/$id/options
+	   touch $dev/$id/options/nosuid
+	   ls -l $dev/$id/options
 	   ;;
 	*)
-	   continue 
+	   continue
 	   ;;
 	esac
     done
diff --git a/lib/partman/common/94edultsp b/lib/partman/common/94edultsp
index e3d4e5e..ff3a749 100644
--- a/lib/partman/common/94edultsp
+++ b/lib/partman/common/94edultsp
@@ -11,13 +11,13 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-512 10000 2048 ext4 
+512 10000 2048 ext4
         $lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 11264 4000 15360 ext4
         $lvmok{ }
@@ -26,7 +26,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /usr } .
-	
+
 6400 3000 10240 ext4
         $lvmok{ }
         method{ format }
@@ -50,7 +50,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /opt } .
-	
+
 64 2000 4096 ext4
         $lvmok{ }
         method{ format }
@@ -58,9 +58,9 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /var/opt/ltsp/swapfiles } .
-	
-64 10000 4096 linux-swap 
-	method{ swap } 
+
+64 10000 4096 linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/common/96eduwork b/lib/partman/common/96eduwork
index b980868..c57a942 100644
--- a/lib/partman/common/96eduwork
+++ b/lib/partman/common/96eduwork
@@ -11,13 +11,13 @@ debian-edu-install/text/partman-debian-edu-workstation ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-5056 3000 10240 ext4 
+5056 3000 10240 ext4
 	$lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 11712 3000 15360 ext4
         $lvmok{ }
@@ -27,8 +27,8 @@ debian-edu-install/text/partman-debian-edu-workstation ::
         filesystem{ ext4 }
         mountpoint{ /usr } .
 
-200% 10000 200% linux-swap 
-	method{ swap } 
+200% 10000 200% linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/common/98edustandalone b/lib/partman/common/98edustandalone
index abbae23..1f254df 100644
--- a/lib/partman/common/98edustandalone
+++ b/lib/partman/common/98edustandalone
@@ -11,13 +11,13 @@ debian-edu-install/text/partman-debian-edu-standalone ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-11520 3000 15360 ext4 
+11520 3000 15360 ext4
 	$lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 4032 3000 10240 ext4
 	$lvmok{ }
@@ -35,8 +35,8 @@ debian-edu-install/text/partman-debian-edu-standalone ::
 	filesystem{ ext4 }
 	mountpoint{ /home } .
 
-200% 10000 200% linux-swap 
-	method{ swap } 
+200% 10000 200% linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes-powerpc-powermac_newworld/94edultsp b/lib/partman/recipes-powerpc-powermac_newworld/94edultsp
index 70c037f..46cb943 100644
--- a/lib/partman/recipes-powerpc-powermac_newworld/94edultsp
+++ b/lib/partman/recipes-powerpc-powermac_newworld/94edultsp
@@ -15,13 +15,13 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-512 10000 2048 ext4 
+512 10000 2048 ext4
         $lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 11264 4000 15360 ext4
         $lvmok{ }
@@ -30,7 +30,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /usr } .
-	
+
 6400 3000 10240 ext4
         $lvmok{ }
         method{ format }
@@ -54,7 +54,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /opt } .
-	
+
 64 2000 4096 ext4
         $lvmok{ }
         method{ format }
@@ -62,9 +62,9 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /var/opt/ltsp/swapfiles } .
-	
-64 10000 4096 linux-swap 
-	method{ swap } 
+
+64 10000 4096 linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes-powerpc-powermac_newworld/96eduwork b/lib/partman/recipes-powerpc-powermac_newworld/96eduwork
index e549429..bd4ea2f 100644
--- a/lib/partman/recipes-powerpc-powermac_newworld/96eduwork
+++ b/lib/partman/recipes-powerpc-powermac_newworld/96eduwork
@@ -15,13 +15,13 @@ debian-edu-install/text/partman-debian-edu-workstation ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-5056 3000 10240 ext4 
+5056 3000 10240 ext4
 	$lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 11712 3000 15360 ext4
         $lvmok{ }
@@ -31,8 +31,8 @@ debian-edu-install/text/partman-debian-edu-workstation ::
         filesystem{ ext4 }
         mountpoint{ /usr } .
 
-200% 10000 200% linux-swap 
-	method{ swap } 
+200% 10000 200% linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes-powerpc-powermac_newworld/98edustandalone b/lib/partman/recipes-powerpc-powermac_newworld/98edustandalone
index 3e1fefe..9db9360 100644
--- a/lib/partman/recipes-powerpc-powermac_newworld/98edustandalone
+++ b/lib/partman/recipes-powerpc-powermac_newworld/98edustandalone
@@ -15,13 +15,13 @@ debian-edu-install/text/partman-debian-edu-standalone ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-11520 3000 15360 ext4 
+11520 3000 15360 ext4
 	$lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 4032 3000 10240 ext4
 	$lvmok{ }
@@ -39,8 +39,8 @@ debian-edu-install/text/partman-debian-edu-standalone ::
 	filesystem{ ext4 }
 	mountpoint{ /home } .
 
-200% 10000 200% linux-swap 
-	method{ swap } 
+200% 10000 200% linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes-powerpc-prep/94edultsp b/lib/partman/recipes-powerpc-prep/94edultsp
index 3dd1a10..b6fef8d 100644
--- a/lib/partman/recipes-powerpc-prep/94edultsp
+++ b/lib/partman/recipes-powerpc-prep/94edultsp
@@ -15,13 +15,13 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-512 10000 2048 ext4 
+512 10000 2048 ext4
         $lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 11264 4000 15360 ext4
         $lvmok{ }
@@ -30,7 +30,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /usr } .
-	
+
 6400 3000 10240 ext4
         $lvmok{ }
         method{ format }
@@ -54,7 +54,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /opt } .
-	
+
 64 2000 4096 ext4
         $lvmok{ }
         method{ format }
@@ -62,9 +62,9 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /var/opt/ltsp/swapfiles } .
-	
-64 10000 4096 linux-swap 
-	method{ swap } 
+
+64 10000 4096 linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes-powerpc-prep/96eduwork b/lib/partman/recipes-powerpc-prep/96eduwork
index f5b1886..cb627bb 100644
--- a/lib/partman/recipes-powerpc-prep/96eduwork
+++ b/lib/partman/recipes-powerpc-prep/96eduwork
@@ -15,13 +15,13 @@ debian-edu-install/text/partman-debian-edu-workstation ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-5056 3000 10240 ext4 
+5056 3000 10240 ext4
 	$lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 11712 3000 15360 ext4
         $lvmok{ }
@@ -31,8 +31,8 @@ debian-edu-install/text/partman-debian-edu-workstation ::
         filesystem{ ext4 }
         mountpoint{ /usr } .
 
-200% 10000 200% linux-swap 
-	method{ swap } 
+200% 10000 200% linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes-powerpc-prep/98edustandalone b/lib/partman/recipes-powerpc-prep/98edustandalone
index 5720d0a..309b245 100644
--- a/lib/partman/recipes-powerpc-prep/98edustandalone
+++ b/lib/partman/recipes-powerpc-prep/98edustandalone
@@ -15,13 +15,13 @@ debian-edu-install/text/partman-debian-edu-standalone ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-11520 3000 15360 ext4 
+11520 3000 15360 ext4
 	$lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 4032 3000 10240 ext4
 	$lvmok{ }
@@ -39,8 +39,8 @@ debian-edu-install/text/partman-debian-edu-standalone ::
 	filesystem{ ext4 }
 	mountpoint{ /home } .
 
-200% 10000 200% linux-swap 
-	method{ swap } 
+200% 10000 200% linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes/94edultsp b/lib/partman/recipes/94edultsp
index cf394f1..92da14b 100644
--- a/lib/partman/recipes/94edultsp
+++ b/lib/partman/recipes/94edultsp
@@ -10,13 +10,13 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-512 10000 2048 ext4 
+512 10000 2048 ext4
         $lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 11264 4000 15360 ext4
         $lvmok{ }
@@ -25,7 +25,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /usr } .
-	
+
 6400 3000 10240 ext4
         $lvmok{ }
         method{ format }
@@ -49,7 +49,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /opt } .
-	
+
 64 2000 4096 ext4
         $lvmok{ }
         method{ format }
@@ -57,9 +57,9 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	use_filesystem{ }
 	filesystem{ ext4 }
 	mountpoint{ /var/opt/ltsp/swapfiles } .
-	
-64 10000 4096 linux-swap 
-	method{ swap } 
+
+64 10000 4096 linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes/96eduwork b/lib/partman/recipes/96eduwork
index 3206d51..3a04792 100644
--- a/lib/partman/recipes/96eduwork
+++ b/lib/partman/recipes/96eduwork
@@ -10,13 +10,13 @@ debian-edu-install/text/partman-debian-edu-workstation ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-5056 3000 10240 ext4 
+5056 3000 10240 ext4
 	$lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 11712 3000 15360 ext4
         $lvmok{ }
@@ -26,8 +26,8 @@ debian-edu-install/text/partman-debian-edu-workstation ::
         filesystem{ ext4 }
         mountpoint{ /usr } .
 
-200% 10000 200% linux-swap 
-	method{ swap } 
+200% 10000 200% linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/lib/partman/recipes/98edustandalone b/lib/partman/recipes/98edustandalone
index b34247c..58b4d1b 100644
--- a/lib/partman/recipes/98edustandalone
+++ b/lib/partman/recipes/98edustandalone
@@ -10,13 +10,13 @@ debian-edu-install/text/partman-debian-edu-standalone ::
         filesystem{ ext4 }
         mountpoint{ /boot } .
 
-11520 3000 15360 ext4 
+11520 3000 15360 ext4
 	$lvmok{ }
-	method{ format } 
-	format{ } 
-	use_filesystem{ } 
-	filesystem{ ext4 } 
-	mountpoint{ / } . 
+	method{ format }
+	format{ }
+	use_filesystem{ }
+	filesystem{ ext4 }
+	mountpoint{ / } .
 
 4032 3000 10240 ext4
 	$lvmok{ }
@@ -34,8 +34,8 @@ debian-edu-install/text/partman-debian-edu-standalone ::
 	filesystem{ ext4 }
 	mountpoint{ /home } .
 
-200% 10000 200% linux-swap 
-	method{ swap } 
+200% 10000 200% linux-swap
+	method{ swap }
         $lvmok{ }
 	format{ } .
 
diff --git a/preseed-values/defaults.README b/preseed-values/defaults.README
index a8b5abc..80e887a 100644
--- a/preseed-values/defaults.README
+++ b/preseed-values/defaults.README
@@ -1,7 +1,7 @@
 Debian-Edu default answers to Debian debconf questions
 ======================================================
 
-The format of these files are 
+The format of these files are
 
 <owner package> <debconf code> <question type> <new default answer>
 
diff --git a/preseed-values/defaults.main-server b/preseed-values/defaults.main-server
index e62f658..34a431c 100644
--- a/preseed-values/defaults.main-server
+++ b/preseed-values/defaults.main-server
@@ -63,7 +63,7 @@ squid squid/fix_cachedir_perms boolean true
 # Dont set up webadmin-configmode for courier
 courier-base courier-base/webadmin-configmode boolean false
 
-# We dont mind setting up a certificate later 
+# We dont mind setting up a certificate later
 courier-ssl courier-ssl/certnotice boolean false
 
 # Provide a default icingaadmin password, enable cgi
diff --git a/preseed-values/defaults.networked b/preseed-values/defaults.networked
index d65ac5a..9ed491f 100644
--- a/preseed-values/defaults.networked
+++ b/preseed-values/defaults.networked
@@ -32,7 +32,7 @@ ocsinventory-agent ocsinventory-agent/method string http
 #ocsinventory-agent ocsinventory-agent/server string sitesummary
 
 # enable the WINS settings feature for addresses via DHCP
-samba-common samba-common/dhcp boolean true 
+samba-common samba-common/dhcp boolean true
 
 # Configure gosa-desktop
 gosa-desktop gosa-desktop/url string https://www/gosa/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git



More information about the debian-edu-commits mailing list