From 28087e3f1788db8752631206ebdcc37d174c316a Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Fri, 3 Feb 2006 15:41:58 +0000
Subject: [PATCH] *** empty log message ***

---
 commands/scripts/Makefile  |  4 ++++
 commands/scripts/packme.sh | 22 ++++++++++++++++++++++
 commands/scripts/setup.sh  |  2 +-
 etc/mtree/minix.tree       |  1 +
 tools/release.sh           |  2 +-
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 commands/scripts/packme.sh

diff --git a/commands/scripts/Makefile b/commands/scripts/Makefile
index 22cd8f22c..e7dbaa113 100755
--- a/commands/scripts/Makefile
+++ b/commands/scripts/Makefile
@@ -42,6 +42,7 @@ usr:	\
 	/usr/bin/binsizes \
 	/usr/bin/rotate \
 	/usr/bin/floppysetup \
+	/usr/bin/packme \
 	/usr/bin/spell \
 	/usr/bin/srccrc \
 	/usr/bin/svclog \
@@ -137,6 +138,9 @@ clean:
 /usr/bin/binsizes:	binsizes.sh
 	install -m 755 -c -o bin $? $@
 
+/usr/bin/packme:	packme.sh
+	install -m 755 -c -o bin $? $@
+
 /usr/bin/spell:	spell.sh
 	install -m 755 -c -o bin $? $@
 
diff --git a/commands/scripts/packme.sh b/commands/scripts/packme.sh
new file mode 100644
index 000000000..106fa5e62
--- /dev/null
+++ b/commands/scripts/packme.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e 
+
+RC=/usr/etc/rc.package
+CDDIR=PACKAGES
+
+if [ -f "$RC" ]
+then	. "$RC"
+fi
+
+cd /
+
+if [ -n "$cddrive" ]
+then	isodir "$cddrive" $CDDIR | grep -i tbz | while read package
+	do	echo -n "Install $package (y/n) ? "
+		read y
+		if [ "$y" = y ]
+		then	isoread "$cddrive" $CDDIR/$package | bzip2 -d | pax -r -p e '*' / || echo "Extract failed."
+		fi
+	done
+fi
diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index da3da0f26..bf20eaded 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -618,7 +618,7 @@ edparams /dev/$root "rootdev=$root; ramimagedev=$root; $disable; minix(1,Start M
 pfile="/mnt/src/tools/fdbootparams"
 echo "rootdev=$root; ramimagedev=$root; $disable; save" >$pfile
 # Save name of CD drive
-echo "cddrive=`mount | grep usr | awk '{ print $1 }'`" >>/mnt/etc/rc.package
+echo "cddrive=`mount | grep usr | awk '{ print $1 }' | sed 's/p.*//'`" >>/mnt/etc/rc.package
 
 sync
 
diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree
index 7941ee5a2..218b3c70c 100644
--- a/etc/mtree/minix.tree
+++ b/etc/mtree/minix.tree
@@ -45,6 +45,7 @@
 755  bin    operator  /usr/local/man/man7
 755  bin    operator  /usr/local/man/man8
 755  bin    operator  /usr/local/man/man9
+775  bin     operator  /usr/local/packages
 775  bin     operator  /usr/local/src
 755  bin     operator  /usr/man
 755  bin     operator  /usr/man/man1
diff --git a/tools/release.sh b/tools/release.sh
index 9db55896a..ffe0bc25a 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -260,7 +260,7 @@ sh mkboot cdfdboot
 cp $IMAGE $CDFILES/bootflop.img
 cp release/cd/* $CDFILES
 
-DESTPACKAGES=`pwd`/release/cd/Packages
+DESTPACKAGES=`pwd`/release/cd/PACKAGES
 rm -rf $DESTPACKAGES
 mkdir $DESTPACKAGES
 
-- 
2.44.0