[Parsix-Devel] SVN Commit 2579 - in /pkg/main/parsix-installer/trunk: ./ debian/

[alanbach-guest at users.alioth.debian.org]

Author: alanbach-guest
Date: Sun Dec  2 06:58:06 2007
New Revision: 2579

URL: http://svn.debian.org/wsvn/pkg-parsix/?sc=1&rev=2579
Log:
* Libata is enabled by default, so remove Dell MM061 series workround, * Some more clean-ups

Modified:
    pkg/main/parsix-installer/trunk/02-install-tools.bm
    pkg/main/parsix-installer/trunk/boot-tools.bm
    pkg/main/parsix-installer/trunk/debian/changelog

Modified: pkg/main/parsix-installer/trunk/02-install-tools.bm
URL: http://svn.debian.org/wsvn/pkg-parsix/pkg/main/parsix-installer/trunk/02-install-tools.bm?rev=2579&op=diff
==============================================================================
--- pkg/main/parsix-installer/trunk/02-install-tools.bm (original)
+++ pkg/main/parsix-installer/trunk/02-install-tools.bm Sun Dec  2 06:58:06 2007
@@ -190,10 +190,6 @@
 # These are additional services that can be used with _all_ modes.
 system_add_services()
 {
-	# FCDSL Anpassung
-	[ -e /etc/rc0.d/K15isdnactivecards ] &&	chroot_it update-rc.d -f isdnactivecards defaults 13 15 >/dev/null
-	[ -e /etc/rc0.d/K21capiutils ] &&	chroot_it update-rc.d -f capiutils defaults 13 21 >/dev/null
-
 	# ALSA aktivieren, wenn möglich
 	if [ -e /proc/asound/modules ]; then
 		if [ -x /etc/init.d/alsa-utils ]; then
@@ -207,15 +203,7 @@
 	
 	[ -x /etc/init.d/mountall.sh ] &&  chroot_it update-rc.d -f mountall.sh start 35 S . &>/dev/null
 
-	if [ "$INSTALL_KANO" = "no" ]; then
-		# Set packages to hold/ prevent KDE update (Knoppix only):
-		echo "kdelibs4-dev hold"  | chroot_it dpkg --set-selections
-		echo "libqt3-mt-dev hold" | chroot_it dpkg --set-selections
-		echo "libxft2-dev hold"   | chroot_it dpkg --set-selections
-	else
-		# XXX: well, we only need the old version for live purposes
-		echo "eject install"      | chroot_it dpkg --set-selections
-				
+	if [ "$INSTALL_KANO" = "yes" ]; then				
 		# configure /etc/kernel-pkg.conf
 		[ -f "$TARGET_MNT_POINT/etc/kernel-pkg.conf" ] && \
 			perl -pi -e "s/^maintainer.*\=.*/maintainer \:\= $NAME_NAME/;s/^email.*\=.*/email \:\= $USER_NAME\@$HOST_NAME\.local/" "$TARGET_MNT_POINT/etc/kernel-pkg.conf"

Modified: pkg/main/parsix-installer/trunk/boot-tools.bm
URL: http://svn.debian.org/wsvn/pkg-parsix/pkg/main/parsix-installer/trunk/boot-tools.bm?rev=2579&op=diff
==============================================================================
--- pkg/main/parsix-installer/trunk/boot-tools.bm (original)
+++ pkg/main/parsix-installer/trunk/boot-tools.bm Sun Dec  2 06:58:06 2007
@@ -399,16 +399,6 @@
 	GRUB_CMDLINE="$GRUB_CMDLINE resume=swap:$SWAP"
 	#end Suspend2
 
-	#DELL MM061 series bug, #42, experimental
-	MFG=`dmidecode --string system-manufacturer | grep -c Dell`
-	if [ $MFG -ne 0 ]; then
-		MODEL=`dmidecode --string system-product-name | grep -c MM061`
-		if [ $MODEL -ne 0 ]; then
-			GRUB_CMDLINE="$GRUB_CMDLINE hdc=noprobe libata.atapi_enable=1"
-		fi
-	fi
-	#end DELL MM061 series bug
-
 	perl -pi -e "s|^# kopt=root=(.*) ro|# kopt=root=\1 ro $GRUB_CMDLINE|g" $TARGET_MNT_POINT/boot/grub/menu.lst
 
 	export device_map=$TARGET_MNT_POINT/boot/grub/device.map

Modified: pkg/main/parsix-installer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-parsix/pkg/main/parsix-installer/trunk/debian/changelog?rev=2579&op=diff
==============================================================================
--- pkg/main/parsix-installer/trunk/debian/changelog (original)
+++ pkg/main/parsix-installer/trunk/debian/changelog Sun Dec  2 06:58:06 2007
@@ -1,3 +1,11 @@
+parsix-installer (0.81.2.7) unstable; urgency=low
+
+  * Libata is enabled by default, so remove Dell MM061 series
+    workround.
+  * Some more clean-ups.  
+
+ -- Alan Baghumian <alan at travis>  Sun, 02 Dec 2007 10:26:14 +0330
+
 parsix-installer (0.81.2.6) unstable; urgency=low
 
   * Re-enabled reiserfs, seems that TuxOnIce bug #305 has