[Debian-live-changes] r1637 - in dists/trunk/live-initramfs: bin docs scripts scripts/live-bottom
daniel at alioth.debian.org
daniel at alioth.debian.org
Wed May 23 08:24:37 UTC 2007
Author: daniel
Date: 2007-05-23 08:24:37 +0000 (Wed, 23 May 2007)
New Revision: 1637
Modified:
dists/trunk/live-initramfs/bin/live-snapshot
dists/trunk/live-initramfs/docs/ChangeLog
dists/trunk/live-initramfs/scripts/live
dists/trunk/live-initramfs/scripts/live-bottom/10adduser
dists/trunk/live-initramfs/scripts/live-bottom/14locales
dists/trunk/live-initramfs/scripts/live-bottom/15autologin
dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
Log:
Modified: dists/trunk/live-initramfs/bin/live-snapshot
===================================================================
--- dists/trunk/live-initramfs/bin/live-snapshot 2007-05-23 08:08:43 UTC (rev 1636)
+++ dists/trunk/live-initramfs/bin/live-snapshot 2007-05-23 08:24:37 UTC (rev 1637)
@@ -154,7 +154,7 @@
{
dir1="`Base_path $1`"
dir2="`Base_path $2`"
- if [ "${dir1}" == "${dir2}" ]; then
+ if [ "${dir1}" = "${dir2}" ]; then
return 0
else
return 1
Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog 2007-05-23 08:08:43 UTC (rev 1636)
+++ dists/trunk/live-initramfs/docs/ChangeLog 2007-05-23 08:24:37 UTC (rev 1637)
@@ -1,5 +1,10 @@
-2007-06-18 Daniel Baumann <daniel at debian.org>
+2007-05-23 Daniel Baumann <daniel at debian.org>
+ * scripts/*:
+ - Minor code cleanup.
+
+2007-05-18 Daniel Baumann <daniel at debian.org>
+
* scripts/live, scripts/live-bottom/05mountpoints:
- Replaced 'mount -o move' with 'mount --move'.
* scripts/live, scripts/live-bottom/10adduser:
@@ -17,7 +22,7 @@
- Also recognize ext3, but treat it like ext2.
* Uploaded 1.87.4-1.
-2007-06-12 Daniel Baumann <daniel at debian.org>
+2007-05-12 Daniel Baumann <daniel at debian.org>
* scripts/live-bottom/*:
- Added generic header.
Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live 2007-05-23 08:08:43 UTC (rev 1636)
+++ dists/trunk/live-initramfs/scripts/live 2007-05-23 08:24:37 UTC (rev 1637)
@@ -76,7 +76,7 @@
export PERSISTENT="" ;;
ip*)
STATICIP=${x#ip=}
- if [ "${STATICIP}" == "" ]; then
+ if [ "${STATICIP}" = "" ]; then
STATICIP="frommedia"
fi
export STATICIP ;;
@@ -118,10 +118,10 @@
# sort of compatibility with netboot.h from linux docs
if [ -z "${NETBOOT}" ]; then
- if [ "${ROOT}" == "/dev/nfs" ]; then
+ if [ "${ROOT}" = "/dev/nfs" ]; then
NETBOOT="nfs"
export NETBOOT
- elif [ "${ROOT}" == "/dev/cifs" ]; then
+ elif [ "${ROOT}" = "/dev/cifs" ]; then
NETBOOT="cifs"
export NETBOOT
fi
Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-23 08:08:43 UTC (rev 1636)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-23 08:24:37 UTC (rev 1637)
@@ -26,7 +26,7 @@
# live-initramfs script
-if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+if [ "${BUILD_SYSTEM}" = "Debian" ]; then
user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s`
else
user_crypted="U6aMy0wojraho" # "ubuntu"
@@ -41,7 +41,7 @@
set passwd/user-uid 999
EOF
-if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+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
@@ -62,7 +62,7 @@
then
if [ -f /root/etc/sudoers ]; then
- if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; 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)
Modified: dists/trunk/live-initramfs/scripts/live-bottom/14locales
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-23 08:08:43 UTC (rev 1636)
+++ dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-23 08:24:37 UTC (rev 1637)
@@ -70,7 +70,7 @@
really_export LANG
- if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+ 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}"
Modified: dists/trunk/live-initramfs/scripts/live-bottom/15autologin
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-23 08:08:43 UTC (rev 1636)
+++ dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-23 08:24:37 UTC (rev 1637)
@@ -36,7 +36,7 @@
fi
if chroot /root [ -f ${GDMCONF} ]; then
- if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+ if [ "${BUILD_SYSTEM}" = "Debian" ]; then
# true hack ! -- nohar
chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
fi
Modified: dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-23 08:08:43 UTC (rev 1636)
+++ dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-23 08:24:37 UTC (rev 1637)
@@ -43,7 +43,7 @@
chroot /root /usr/sbin/xdebconfigurator
fi
-if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
set xserver-xorg/autodetect_keyboard true
fset xserver-xorg/autodetect_keyboard seen true
More information about the Debian-live-changes
mailing list