Removing ubuntu support.

Makefile

@@ -1,7 +1,5 @@
 # Makefile
 
-BUILD_SYSTEM := $(shell lsb_release --short --id)
-
 TRANSLATIONS="it"
 
 all: build
@@ -13,12 +11,10 @@ test:
 	done
 
 build:
-	# Setting BUILD_SYSTEM
-	sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
 
 install: test build
 	# Installing configuration
-	install -D -m 0644 live.conf $(DESTDIR)/etc/live.conf
+	install -D -m 0644 conf/live.conf $(DESTDIR)/etc/live.conf
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/sbin
@@ -116,7 +112,6 @@ update:
 	done
 
 clean:
-	rm -f live.conf
 
 distclean:
 

bin/live-snapshot

@@ -35,10 +35,9 @@ then
 else
 	USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
 	HOSTNAME=$(hostname)
-	BUILD_SYSTEM="Debian"
 fi
 
-export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
+export USERNAME USERFULLNAME HOSTNAME
 
 # Source helper functions
 helpers="/usr/share/initramfs-tools/scripts/live-helpers"

conf/live.conf

@@ -1,9 +1,7 @@
 # /etc/live.conf - configuration file for live-initramfs(7)
 
-BUILD_SYSTEM="Debian"
-
 USERNAME="user"
 USERFULLNAME="Debian Live user"
 HOSTNAME="debian"
 
-export BUILD_SYSTEM USERNAME USERFULLNAME HOSTNAME
+export USERNAME USERFULLNAME HOSTNAME

debian/control

@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Debian Live <debian-live-maint@lists.alioth.debian.org>
 Uploaders: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 5), asciidoc, docbook-xsl, lsb-release, xsltproc
+Build-Depends: debhelper (>= 5), asciidoc, docbook-xsl, xsltproc
 Standards-Version: 3.7.2
 XS-Homepage: http://debian-live.alioth.debian.org/
 XS-Upstream-Depends: git-core

debian/rules

@@ -12,7 +12,6 @@ build-stamp:
 	dh_testdir
 
 	# Building package
-	$(MAKE)
 	$(MAKE) -C manpages
 
 	touch build-stamp
@@ -23,7 +22,6 @@ clean:
 	rm -f build-stamp
 
 	# Cleaning package
-	$(MAKE) clean
 	$(MAKE) -C manpages clean
 
 	dh_clean

hooks/live

@@ -109,15 +109,6 @@ fi
 copy_exec /usr/bin/md5sum /bin
 
 # Program: udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
-	mkdir -p "${DESTDIR}"/lib/udev
-
-	copy_exec /lib/udev/cdrom_id /lib/udev
-	copy_exec /lib/udev/path_id /lib/udev
-	copy_exec /lib/udev/vol_id /lib/udev
-fi
-
 copy_exec /sbin/udevtrigger /sbin
 copy_exec /sbin/udevsettle /sbin
 copy_exec /usr/bin/udevinfo /bin

scripts/live

@@ -18,12 +18,11 @@ home_snapshot_label="home-sn"
 USERNAME="user"
 USERFULLNAME="Live user"
 HOSTNAME="host"
-BUILD_SYSTEM="Custom"
 
 mkdir -p "${mountpoint}"
 
 [ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
+export USERNAME USERFULLNAME HOSTNAME
 
 . /scripts/live-helpers
 
@@ -618,7 +617,7 @@ do_netmount ()
 {
 	rc=1
 
-	modprobe "${MP_QUIET}" af_packet # For DHCP
+	modprobe -q af_packet # For DHCP
 
 	udevtrigger
 	udevsettle
@@ -688,7 +687,7 @@ do_nfsmount ()
 {
 	rc=1
 
-	modprobe "${MP_QUIET}" nfs
+	modprobe -q nfs
 
 	if [ -z "${NFSOPTS}" ]
 	then
@@ -721,7 +720,7 @@ do_cifsmount ()
 		fi
 
 		[ "${quiet}" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
-		modprobe "${MP_QUIET}" cifs
+		modprobe -q cifs
 
 		if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}"
 		then
@@ -861,7 +860,7 @@ setup_unionfs ()
 	image_directory="${1}"
 	rootmnt="${2}"
 
-	modprobe "${MP_QUIET}" -b ${UNIONTYPE}
+	modprobe -q -b ${UNIONTYPE}
 
 	# run-init can't deal with images in a subdir, but we're going to
 	# move all of these away before it runs anyway.  No, we're not,

scripts/live-bottom/10adduser

@@ -31,12 +31,7 @@ log_begin_msg "Adding live session user..."
 
 # live-initramfs script
 
-if [ "${BUILD_SYSTEM}" = "Debian" ]
-then
-	user_crypted="8Ab05sVQ4LLps" # as in $(echo "live" | mkpasswd -s)
-else
-	user_crypted="U6aMy0wojraho" # "ubuntu"
-fi
+user_crypted="8Ab05sVQ4LLps" # as in $(echo "live" | mkpasswd -s)
 
 # U6aMy0wojraho is just a blank password
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
@@ -48,14 +43,9 @@ set passwd/username ${USERNAME}
 set passwd/user-uid 999
 EOF
 
-if [ "${BUILD_SYSTEM}" = "Debian" ]
-then
-	chroot /root /usr/bin/env -i HOME="/root" \
-		TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
-		/usr/lib/user-setup/user-setup-apply > /dev/null
-else
-	chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
-fi
+chroot /root /usr/bin/env -i HOME="/root" \
+	TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
+	/usr/lib/user-setup/user-setup-apply > /dev/null
 
 # Clear out debconf database again to avoid confusing ubiquity later.
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
@@ -71,43 +61,25 @@ if [ -z "${NOSUDO}" ]
 then
 	if [ -f /root/etc/sudoers ]
 	then
-		if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-		then
-			grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
-
-			# XXX - awful hack to stop xscreensaver locking the screen (#7150)
-			echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
-
-			for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop
-			do
-				if [ -f "/root/${file}" ]
-				then
-					chroot /root install -D -o ${USERNAME} -g ${USERNAME} ${file} /home/${USERNAME}/Desktop/$(basename "${file}")
-					break
-				fi
-			done
-		elif [ "${BUILD_SYSTEM}" = "Debian" ]
-		then
-			echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
+		echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
 
-			chroot /root sudo -u "${USERNAME}" sh -c "echo 'SU_TO_ROOT_SU=sudo' >> /home/${USERNAME}/.su-to-rootrc"
-			chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/sudo-mode true
-			chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/display-no-pass-info false
+		chroot /root sudo -u "${USERNAME}" sh -c "echo 'SU_TO_ROOT_SU=sudo' >> /home/${USERNAME}/.su-to-rootrc"
+		chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/sudo-mode true
+		chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/display-no-pass-info false
 
 chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/config && cat > /home/${USERNAME}/.kde/share/config/kdesurc" << EOF
 [super-user-command]
 super-user-command=sudo
 EOF
 
-			if [ -f /root/usr/share/apps/konsole/sumc.desktop ]
-			then
-				chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo mc -c/' /usr/share/apps/konsole/sumc.desktop > /home/${USERNAME}/.kde/share/apps/konsole/sumc.desktop"
-			fi
+		if [ -f /root/usr/share/apps/konsole/sumc.desktop ]
+		then
+			chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo mc -c/' /usr/share/apps/konsole/sumc.desktop > /home/${USERNAME}/.kde/share/apps/konsole/sumc.desktop"
+		fi
 
-			if [ -f /root/usr/share/apps/konsole/su.desktop ]
-			then
-				chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo -i/' /usr/share/apps/konsole/su.desktop > /home/${USERNAME}/.kde/share/apps/konsole/su.desktop"
-			fi
+		if [ -f /root/usr/share/apps/konsole/su.desktop ]
+		then
+			chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo -i/' /usr/share/apps/konsole/su.desktop > /home/${USERNAME}/.kde/share/apps/konsole/su.desktop"
 		fi
 	fi
 fi
@@ -118,9 +90,4 @@ then
 	mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/
 fi
 
-if [ -f "/root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved" ]
-then
-	chroot /root install -D -o ${USERNAME} -g ${USERNAME} /usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved /home/${USERNAME}/Desktop/about-kubuntu.desktop
-fi
-
 log_end_msg

scripts/live-bottom/14locales

@@ -88,16 +88,9 @@ then
 
 	really_export LANG
 
-	if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-	then
-		printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
-		chroot /root /usr/sbin/locale-gen "${LANG}"
-		live-preseed /root debian-installer/locale "${locale}"
-	else
-		printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
-		printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
-		chroot /root /usr/sbin/locale-gen
-	fi
+	printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
+	printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
+	chroot /root /usr/sbin/locale-gen
 fi
 
 log_end_msg

scripts/live-bottom/15autologin

@@ -42,11 +42,8 @@ fi
 # chroot needed to handle symlinks correctly
 if chroot /root [ -f ${GDMCONF} ]
 then
-	if [ "${BUILD_SYSTEM}" = "Debian" ]
-	then
-		# true hack ! -- nohar
-		chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
-	fi
+	# true hack ! -- nohar
+	chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
 
 	# Configure GDM autologin
 	chroot /root \

scripts/live-bottom/20xconfig

@@ -55,30 +55,20 @@ then
 	chroot /root /usr/sbin/xdebconfigurator
 fi
 
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+if [ -n "${KOPTIONS}" ]
 then
+	setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
+fi
 
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/autodetect_keyboard true
-fset xserver-xorg/autodetect_keyboard seen true
-EOF
-
-else
-	# d-i code not present, so:
-	if [ -n "${KOPTIONS}" ]
-	then
-		setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
-	fi
-
-	if [ -n "${KVARIANT}" ]
-	then
-		setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
-	fi
+if [ -n "${KVARIANT}" ]
+then
+	setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
+fi
 
-	if [ -n "${KMODEL}" ]
-	then
-		setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
-	fi
+if [ -n "${KMODEL}" ]
+then
+	setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
+fi
 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
@@ -87,8 +77,6 @@ ${setmodel}
 ${setoptions}
 EOF
 
-fi
-
 DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
 umount /root/sys
 umount /root/proc

scripts/live-bottom/22screensaver

@@ -40,8 +40,4 @@ then
 	chroot /root sudo -u "${USERNAME}" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
 fi
 
-if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
-	printf "[ScreenSaver]\nLock=false\n" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kdesktoprc
-fi
-
 log_end_msg

scripts/live-bottom/25configure_init

@@ -81,23 +81,6 @@ then
 				do
 					sed -i -e "s|^respawn.*|respawn /bin/login -f ${USERNAME} </dev/$(basename ${f}) > /dev/$(basename ${f}) 2>\&1|" ${f}
 				done
-
-				if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-				then
-					for x in $(cat /proc/cmdline)
-					do
-						case ${x} in
-							noninteractive)
-								sed -i -e "s|^exec.*|exec /usr/bin/ubiquity noninteractive </dev/tty1 > /dev/tty1 2>\&1|" /root/etc/event.d/tty1
-								rm -f /root/etc/rc?.d/[SK]??[gkx]dm
-								;;
-
-							textonly)
-								rm -f /root/etc/rc?.d/[SK]??[gkx]dm
-								;;
-						esac
-					done
-				fi
 			fi
 		fi