[Debian-live-changes] r1537 - dists/trunk/live-helper/examples/hooks
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri May 18 07:00:07 UTC 2007
Author: daniel
Date: 2007-05-18 07:00:06 +0000 (Fri, 18 May 2007)
New Revision: 1537
Modified:
dists/trunk/live-helper/examples/hooks/beryl.sh
dists/trunk/live-helper/examples/hooks/ipw2100.sh
dists/trunk/live-helper/examples/hooks/ipw2200.sh
dists/trunk/live-helper/examples/hooks/ipw3945.sh
dists/trunk/live-helper/examples/hooks/madwifi.sh
dists/trunk/live-helper/examples/hooks/nvidia-legacy.sh
dists/trunk/live-helper/examples/hooks/rt2570.sh
dists/trunk/live-helper/examples/hooks/rt2x00.sh
Log:
Modified: dists/trunk/live-helper/examples/hooks/beryl.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/beryl.sh 2007-05-18 06:32:00 UTC (rev 1536)
+++ dists/trunk/live-helper/examples/hooks/beryl.sh 2007-05-18 07:00:06 UTC (rev 1537)
@@ -7,13 +7,13 @@
# for forcing aiglx activation type at boot prompt "live forceaiglx"
# for forcing aiglx deactivation type "live noaiglx"
-# Import archive signing key
+# Importing archive signing key
wget -O - http://debian.beryl-project.org/root@lupine.me.uk.gpg | apt-key add -
-# Update indices
+# Updating indices
apt-get update
-# Install packages
+# Installing packages
PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-settings beryl-settings-bindings beryl-settings-simple mesa-utils"
dpkg -s gnome-core > /dev/null 2>&1 && PACKAGES="${PACKAGES} emerald emerald-themes heliodor"
@@ -21,31 +21,32 @@
apt-get install --yes ${PACKAGES}
-# Add init script
+# Adding init script
cat > /etc/init.d/aiglx << EOF
#!/bin/sh
activate_3d()
{
- activate_aiglx
- activate_beryl
+ activate_aiglx
+ activate_beryl
}
activate_aiglx()
{
- echo "" >> /etc/X11/xorg.conf
- echo "# Added by beryl-hook.sh" >> /etc/X11/xorg.conf
- echo "Section \"Extensions\"" >> /etc/X11/xorg.conf
- echo " Option \"Composite\" \"Enable\"" >> /etc/X11/xorg.conf
- echo "EndSection" >> /etc/X11/xorg.conf
+ echo "" >> /etc/X11/xorg.conf
+ echo "# Added by beryl-hook.sh" >> /etc/X11/xorg.conf
+ echo "Section \"Extensions\"" >> /etc/X11/xorg.conf
+ echo " Option \"Composite\" \"Enable\"" >> /etc/X11/xorg.conf
+ echo "EndSection" >> /etc/X11/xorg.conf
- sed -i -e "s/Section \"Device\""/"Section \"Device\"\n\t Option \"XAANoOffscreenPixmaps\" \"true\"\n\t Option \"AddARGBGLXVisuals\" \"on\"\n\t Option \"AllowGLXWithComposite\" \"true\"/" -e "s/Section \"Module\""/"Section \"Module\"\n\t Load \"i2c\"\n\t Load \"int10\"\n\t Load \"xtrap\"\n\t Load \"vbe\"/" /etc/X11/xorg.conf
+ sed -i -e "s/Section \"Device\""/"Section \"Device\"\n\t Option \"XAANoOffscreenPixmaps\" \"true\"\n\t Option \"AddARGBGLXVisuals\" \"on\"\n\t Option \"AllowGLXWithComposite\" \"true\"/" -e "s/Section \"Module\""/"Section \"Module\"\n\t Load \"i2c\"\n\t Load \"int10\"\n\t Load \"xtrap\"\n\t Load \"vbe\"/" /etc/X11/xorg.conf
}
activate_beryl()
{
- # http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
- ! [ -d /etc/xdg/autostart ] && mkdir -p /etc/xdg/autostart
- cat > /etc/xdg/autostart/beryl-manager.desktop <<EOS
+ # http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+ ! [ -d /etc/xdg/autostart ] && mkdir -p /etc/xdg/autostart
+
+cat > /etc/xdg/autostart/beryl-manager.desktop << EOS
[Desktop Entry]
Encoding=UTF-8
Name=Beryl Manager
@@ -58,20 +59,20 @@
Categories=
EOS
- cat > /usr/local/bin/beryl-starter <<EOS
+cat > /usr/local/bin/beryl-starter << EOS
#!/bin/sh
glxinfo > /dev/null 2>&1 && beryl-manager
EOS
- chmod 0755 /usr/local/bin/beryl-starter
+
+chmod 0755 /usr/local/bin/beryl-starter
}
if ! cat /proc/cmdline | grep noaiglx > /dev/null
then
- echo "Configuring xorg for aiglx ..."
- activate_3d
+ echo "Configuring xorg for aiglx..."
+ activate_3d
fi
EOF
chmod 0755 /etc/init.d/aiglx
update-rc.d aiglx defaults
-
Modified: dists/trunk/live-helper/examples/hooks/ipw2100.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/ipw2100.sh 2007-05-18 06:32:00 UTC (rev 1536)
+++ dists/trunk/live-helper/examples/hooks/ipw2100.sh 2007-05-18 07:00:06 UTC (rev 1537)
@@ -8,20 +8,20 @@
#
# e.g with make-live : --sections "main contrib" --kernel-flavour 686
-
-# update indices
+# Updating indices
apt-get update
-# kernel module setup
+# Building kernel module
which m-a || apt-get install --yes module-assistant
m-a update
m-a --non-inter --quiet a-i ipw2100
-# firmware install (http://ipw2100.sourceforge.net/firmware.php)
+# Installing firmware (http://ipw2100.sourceforge.net/firmware.php)
# grabbing 0.55 (Wed May 16 15:17:38 -- matth)
+wget --referer "http://ipw2100.sourceforge.net/firmware.php" "http://ipw2100.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2100-fw-1.3.tgz" -O /tmp/ipw2100-fw-1.3.tgz
-wget --referer "http://ipw2100.sourceforge.net/firmware.php" "http://ipw2100.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2100-fw-1.3.tgz" -O /tmp/ipw2100-fw-1.3.tgz
-cd /tmp && tar zxvf ipw2100-fw-1.3.tgz
-mv /tmp/ipw2100-1.3* /lib/firmware/
-rm -fr ipw2100-fw-1.3.tgz
-cd ${OLDPWD}
\ No newline at end of file
+cd /tmp
+tar xfvz ipw2100-fw-1.3.tgz
+mv ipw2100-1.3* /lib/firmware
+rm -f ipw2100-fw-1.3.tgz
+cd ${OLDPWD}
Modified: dists/trunk/live-helper/examples/hooks/ipw2200.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/ipw2200.sh 2007-05-18 06:32:00 UTC (rev 1536)
+++ dists/trunk/live-helper/examples/hooks/ipw2200.sh 2007-05-18 07:00:06 UTC (rev 1537)
@@ -8,21 +8,20 @@
#
# e.g with make-live : --sections "main contrib" --kernel-flavour 686
-
-# update indices
+# Updating indices
apt-get update
-# kernel module setup
+# Building kernel mdoule
which m-a || apt-get install --yes module-assistant
m-a update
m-a --non-inter --quiet a-i ipw2200
-# firmware install (http://ipw2200.sourceforge.net/firmware.php)
+# Installing firmware (http://ipw2200.sourceforge.net/firmware.php)
# grabbing 3.0 (Wed May 16 15:17:38 -- matth)
-
-
wget --referer "http://ipw2200.sourceforge.net/firmware.php" "http://ipw2200.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2200-fw-3.0.tgz" -O /tmp/ipw2200-fw-3.0.tgz
-cd /tmp && tar zxvf ipw2200-fw-3.0.tgz
+
+cd /tmp
+tar xfvz ipw2200-fw-3.0.tgz
cp ipw2200-fw-3.0/*.fw /lib/firmware/
-rm -fr /tmp/ipw2200-fw-3.0*
+rm -rf ipw2200-fw-3.0*
cd ${OLDPWD}
Modified: dists/trunk/live-helper/examples/hooks/ipw3945.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/ipw3945.sh 2007-05-18 06:32:00 UTC (rev 1536)
+++ dists/trunk/live-helper/examples/hooks/ipw3945.sh 2007-05-18 07:00:06 UTC (rev 1537)
@@ -8,10 +8,10 @@
#
# e.g with make-live : --sections "main non-free"
-# update indices
+# Updating indices
apt-get update
-# kernel module setup
+# Building kernel module
which m-a || apt-get install --yes module-assistant
m-a update
m-a a-i ipw3945 # interactive mode for now
Modified: dists/trunk/live-helper/examples/hooks/madwifi.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/madwifi.sh 2007-05-18 06:32:00 UTC (rev 1536)
+++ dists/trunk/live-helper/examples/hooks/madwifi.sh 2007-05-18 07:00:06 UTC (rev 1537)
@@ -10,15 +10,13 @@
# NOTE: it runs in interactive mode
-# update indices
+# Updating indices
apt-get update
-# userland stuff
-apt-get install madwifi-tools madwifi-doc
-
-# kernel module setup
+# Building kernel module
which m-a || apt-get install --yes module-assistant
m-a update
m-a a-i madwifi
-
+# Installing aditional stuff
+apt-get install --yes madwifi-tools madwifi-doc
Modified: dists/trunk/live-helper/examples/hooks/nvidia-legacy.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/nvidia-legacy.sh 2007-05-18 06:32:00 UTC (rev 1536)
+++ dists/trunk/live-helper/examples/hooks/nvidia-legacy.sh 2007-05-18 07:00:06 UTC (rev 1537)
@@ -8,36 +8,41 @@
#
# e.g with make-live : --sections "main contrib non-free"
-
-# update indices
+# Updating indices
apt-get update
+# Building kernel module
which m-a || apt-get install --yes module-assistant nvidia-kernel-common
m-a update
m-a --non-inter --quiet a-i nvidia-kernel-legacy
+# Installing aditional stuff
apt-get install --yes nvidia-glx-legacy nvidia-xconfig discover
# fixup (#421028)
-cd /usr/lib/xorg/modules/drivers
-[ -f nvidia_drv.o ] && gcc -shared -o nvidia_drv.so nvidia_drv.o
-cd ${OLDPWD}
+if [ -f /usr/lib/xorg/modules/drivers/nvidia_drv.o ]
+then
+ cd /usr/lib/xorg/modules/drivers
+ gcc -shared -o nvidia_drv.so nvidia_drv.o
+ cd ${OLDPWD}
+fi
-# Add init script
-cat > /etc/init.d/nvidia-debian-live <<EOF
+# Adding init script
+cat > /etc/init.d/nvidia-debian-live << EOF
#!/bin/sh
# script that modify xorg configuration enabling
# the nvidia proprietary module if the card is detected
# as an NVidia
-if discover --type-summary display | grep -i nvidia; then
- # forcing depth to 24, bad detection on some card (e.g my GeForce4 440 Go)
- echo "Configuring Xorg for nvidia ..."
- nvidia-xconfig -d 24
+if discover --type-summary display | grep -i nvidia
+then
+ # forcing depth to 24, bad detection on some card (e.g my GeForce4 440 Go)
+ echo "Configuring Xorg for nvidia ..."
+ nvidia-xconfig -d 24
else
- # not with nvidia h/w ? remove those GLX diversions
- # (FIXME)
- apt-get --quiet --yes remove nvidia-glx-legacy
+ # not with nvidia h/w ? remove those GLX diversions
+ # (FIXME)
+ apt-get --quiet --yes remove nvidia-glx-legacy
fi
EOF
Modified: dists/trunk/live-helper/examples/hooks/rt2570.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/rt2570.sh 2007-05-18 06:32:00 UTC (rev 1536)
+++ dists/trunk/live-helper/examples/hooks/rt2570.sh 2007-05-18 07:00:06 UTC (rev 1537)
@@ -5,10 +5,10 @@
# NOTE: it runs in interactive mode
-# update indices
+# Updating indices
apt-get update
-# kernel module setup
+# Building kernel module
which m-a || apt-get install --yes module-assistant
m-a update
m-a a-i rt2570-source
Modified: dists/trunk/live-helper/examples/hooks/rt2x00.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/rt2x00.sh 2007-05-18 06:32:00 UTC (rev 1536)
+++ dists/trunk/live-helper/examples/hooks/rt2x00.sh 2007-05-18 07:00:06 UTC (rev 1537)
@@ -5,18 +5,19 @@
# NOTE: it runs in interactive mode
-# update indices
+# Updating indices
apt-get update
-# kernel module setup
+# Building kernel modules
which m-a || apt-get install --yes module-assistant
m-a update
m-a a-i rt2x00-source
-# get the firmware for rt73usb
+# Installing firmware for rt73usb
+wget "http://www.ralinktech.com.tw/data/RT73_Linux_STA_Drv1.0.4.0.tar.gz" -O /tmp/RT73_Linux_STA_Drv1.0.4.0.tar.gz
+
cd /tmp
-wget "http://www.ralinktech.com.tw/data/RT73_Linux_STA_Drv1.0.4.0.tar.gz"
-tar zxvf RT73_Linux_STA_Drv1.0.4.0.tar.gz
-cp RT73_Linux_STA_Drv1.0.4.0/Module/rt73.bin /lib/firmware/
-rm -fr RT73_Linux_STA_Drv*
+tar xfvz RT73_Linux_STA_Drv1.0.4.0.tar.gz
+cp RT73_Linux_STA_Drv1.0.4.0/Module/rt73.bin /lib/firmware
+rm -rf RT73_Linux_STA_Drv*
cd ${OLDPWD}
More information about the Debian-live-changes
mailing list