From add90203b1e10b3bc4ec3edc9705caf7de0233d2 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 20 Sep 2010 00:58:44 +0000
Subject: larch7: CD that boots, removed xterm & others from vetopacks

---
 build_tools/l7/build_all                           |  2 +-
 build_tools/l7/larch0/profiles/l7/addedpacks       | 24 ++++++++++++----------
 .../l7/larch0/profiles/l7/pacman.conf.repos        |  6 ++++--
 .../profiles/l7/post_process/modify_chroot.sh      |  2 +-
 .../l7/larch0/profiles/l7/rootoverlay/etc/inittab  | 10 +++------
 build_tools/l7/larch0/profiles/l7/vetopacks        |  7 +------
 build_tools/l7/larch0/profiles/l7/vetopacks.orig   |  6 ++++++
 7 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 build_tools/l7/larch0/profiles/l7/vetopacks.orig

diff --git a/build_tools/l7/build_all b/build_tools/l7/build_all
index 7ae83a0..4e78237 100755
--- a/build_tools/l7/build_all
+++ b/build_tools/l7/build_all
@@ -5,7 +5,7 @@ PROFILE=l7
 ./larch-archin -f -p larch0/profiles/$PROFILE install && ./larch-larchify -p larch0/profiles/$PROFILE && ./larch-live_iso -p larch0/profiles/$PROFILE 
 if [ -e linhes.iso ]
 then
-	echo "moving linhes.iso to /tmp/test2.iso
+	echo "moving linhes.iso to /tmp/test2.iso"
 	mv linhes.iso /tmp/test2.iso
 	ls -lah /tmp/test2.iso
 fi
diff --git a/build_tools/l7/larch0/profiles/l7/addedpacks b/build_tools/l7/larch0/profiles/l7/addedpacks
index 6034325..d15ed91 100644
--- a/build_tools/l7/larch0/profiles/l7/addedpacks
+++ b/build_tools/l7/larch0/profiles/l7/addedpacks
@@ -39,16 +39,17 @@ unzip
 
 
 # Xorg packages
-xorg-server
-xorg-xkb-utils
-xorg-xauth
-xorg-server-utils
-xorg-xinit
-xorg-input-drivers
-xterm
-xorg-fonts-100dpi
-xorg-fonts-75dpi
-xorg-res-utils
+*xorg
+#xorg-server
+#xorg-xkb-utils
+#xorg-xauth
+#xorg-server-utils
+#xorg-xinit
+#xorg-input-drivers
+#xorg-apps
+#xorg-fonts-100dpi
+#xorg-fonts-75dpi
+#xorg-res-utils
 ttf-ms-fonts
 
 #xorg-video-drivers
@@ -95,7 +96,8 @@ xf86-video-voodoo
 #luser
 #localed
 unclutter
-
+xterm
+xorg-apps
 #xkmap
 
 #gparted
diff --git a/build_tools/l7/larch0/profiles/l7/pacman.conf.repos b/build_tools/l7/larch0/profiles/l7/pacman.conf.repos
index 8f9d94b..3fdb8f5 100644
--- a/build_tools/l7/larch0/profiles/l7/pacman.conf.repos
+++ b/build_tools/l7/larch0/profiles/l7/pacman.conf.repos
@@ -8,5 +8,7 @@
 
 larch: 		Server = ftp://ftp.berlios.de/pub/larch/larch7.2/*platform*
 
-core-testing:       Server = file:///data/pkg_repo/i686/core-testing
-extra-testing:      Server = file:///data/pkg_repo/i686/extra-testing
+core-testing:       Server = http://localmirror/repo/i686/core-testing
+extra-testing:      Server = http://localmirror/repo/i686/extra-testing
+#core-testing:       Server = file:///data/pkg_repo/i686/core-testing
+#extra-testing:      Server = file:///data/pkg_repo/i686/extra-testing
diff --git a/build_tools/l7/larch0/profiles/l7/post_process/modify_chroot.sh b/build_tools/l7/larch0/profiles/l7/post_process/modify_chroot.sh
index 6caf191..959c0b7 100755
--- a/build_tools/l7/larch0/profiles/l7/post_process/modify_chroot.sh
+++ b/build_tools/l7/larch0/profiles/l7/post_process/modify_chroot.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+echo "fireball" > /etc/hostname
 useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users
 cp -rvpf /.post_process/home/mythtv  /home/
 cp -rvpf /.post_process/home/mythtv/.fluxbox /root
diff --git a/build_tools/l7/larch0/profiles/l7/rootoverlay/etc/inittab b/build_tools/l7/larch0/profiles/l7/rootoverlay/etc/inittab
index 39003ed..b2364fc 100644
--- a/build_tools/l7/larch0/profiles/l7/rootoverlay/etc/inittab
+++ b/build_tools/l7/larch0/profiles/l7/rootoverlay/etc/inittab
@@ -24,13 +24,9 @@ rh:06:wait:/etc/rc.shutdown
 su:S:wait:/sbin/sulogin -p
 
 # -8 options fixes umlauts problem on login
-c1:2345:respawn:/sbin/agetty -8 38400 vc/1 linux -n -l /etc/ulogin
-c2:2345:respawn:/sbin/agetty -8 38400 vc/2 linux
-c3:2345:respawn:/sbin/agetty -8 38400 vc/3 linux
-c4:2345:respawn:/sbin/agetty -8 38400 vc/4 linux
-c5:2345:respawn:/sbin/agetty -8 38400 vc/5 linux
-c6:2345:respawn:/sbin/agetty -8 38400 vc/6 linux
-c7:5:respawn:/usr/bin/openvt -fwc 6 -- /bin/su - mythtv -c /usr/bin/startx >& /dev/null
+c1:2345:respawn:/sbin/agetty -8 38400 tty1 linux -n -l /usr/sbin/ulogin
+c2:2345:respawn:/sbin/agetty -8 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty -8 38400 tty3 linux
 
 ca::ctrlaltdel:/sbin/shutdown -t3 -r now
 
diff --git a/build_tools/l7/larch0/profiles/l7/vetopacks b/build_tools/l7/larch0/profiles/l7/vetopacks
index f85fa2d..2bb19ee 100644
--- a/build_tools/l7/larch0/profiles/l7/vetopacks
+++ b/build_tools/l7/larch0/profiles/l7/vetopacks
@@ -1,6 +1 @@
-xterm
-xorg-twm
-xorg-fonts-75dpi
-xorg-fonts-100dpi
-xorg-docs
-xorg-res-utils
+#xorg-twm
diff --git a/build_tools/l7/larch0/profiles/l7/vetopacks.orig b/build_tools/l7/larch0/profiles/l7/vetopacks.orig
new file mode 100644
index 0000000..f85fa2d
--- /dev/null
+++ b/build_tools/l7/larch0/profiles/l7/vetopacks.orig
@@ -0,0 +1,6 @@
+xterm
+xorg-twm
+xorg-fonts-75dpi
+xorg-fonts-100dpi
+xorg-docs
+xorg-res-utils
-- 
cgit v0.12