pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/mklivecd Update to 0.13.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/d4bd1b568750
branches: trunk
changeset: 498078:d4bd1b568750
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Thu Aug 11 20:48:55 2005 +0000
description:
Update to 0.13.0
Changes:
* New option added: VND_COMPRESSION. To enable vnd(4)
compression on /usr and /var/db/pkg (at the moment).
* Fixed a problem with -k and USE_GNU_GRUB=yes,
building a kernel with -k overwrites the "menu.lst"
file.
* Only copy /etc/X11/XF86Config to $ISODIR when there
is not a previous file, fixes PR pkg/30889.
* Renamed the rc.d script mfs_rcd to livecd, because
it's not only mfs anymore.
Finally we can have kde-3.4.2 with NetBSD in a live CD-ROM:
416M netbsd-3.99.7_kde-3.4.2.iso
Enjoy.
diffstat:
sysutils/mklivecd/Makefile | 9 +-
sysutils/mklivecd/PLIST | 4 +-
sysutils/mklivecd/files/livecd | 71 ++++++++++++++++++++
sysutils/mklivecd/files/mfs_rcd | 51 --------------
sysutils/mklivecd/files/mklivecd.8 | 21 +++++-
sysutils/mklivecd/files/mklivecd.sh | 123 +++++++++++++++++++++++++----------
6 files changed, 183 insertions(+), 96 deletions(-)
diffs (truncated from 473 to 300 lines):
diff -r 63604b9255df -r d4bd1b568750 sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile Thu Aug 11 20:25:20 2005 +0000
+++ b/sysutils/mklivecd/Makefile Thu Aug 11 20:48:55 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2005/08/02 12:32:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/11 20:48:55 xtraeme Exp $
-DISTNAME= mklivecd-0.12.0
-PKGREVISION= 1
+DISTNAME= mklivecd-0.13.0
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
@@ -28,7 +27,7 @@
FILES= KERN-LIVECD personal_config
do-install:
-.for f in mfs_rcd mklivecd.sh mklivecd.8
+.for f in livecd mklivecd.sh mklivecd.8
@${SED} -e "s,@PREFIX@,${PREFIX},g" \
-e "s,@LOCALBASE@,${LOCALBASE},g" \
-e "s,@TAR@,${TAR},g" \
@@ -38,7 +37,7 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/mklivecd
${INSTALL_SCRIPT} ${WRKDIR}/mklivecd.sh ${PREFIX}/sbin/mklivecd
${INSTALL_MAN} ${WRKDIR}/mklivecd.8 ${PREFIX}/man/man8
- ${INSTALL_DATA} ${WRKDIR}/mfs_rcd ${PREFIX}/share/mklivecd
+ ${INSTALL_DATA} ${WRKDIR}/livecd ${PREFIX}/share/mklivecd
.for F in ${FILES}
${INSTALL_DATA} ${FILESDIR}/${F} ${PREFIX}/share/mklivecd
.endfor
diff -r 63604b9255df -r d4bd1b568750 sysutils/mklivecd/PLIST
--- a/sysutils/mklivecd/PLIST Thu Aug 11 20:25:20 2005 +0000
+++ b/sysutils/mklivecd/PLIST Thu Aug 11 20:48:55 2005 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/26 17:28:58 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/08/11 20:48:55 xtraeme Exp $
man/man8/mklivecd.8
sbin/mklivecd
share/mklivecd/KERN-LIVECD
-share/mklivecd/mfs_rcd
+share/mklivecd/livecd
share/mklivecd/personal_config
@dirrm share/mklivecd
diff -r 63604b9255df -r d4bd1b568750 sysutils/mklivecd/files/livecd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/mklivecd/files/livecd Thu Aug 11 20:48:55 2005 +0000
@@ -0,0 +1,71 @@
+# $NetBSD: livecd,v 1.1 2005/08/11 20:48:55 xtraeme Exp $
+#
+# Mount mfs directories and unpack the required files
+# before anything.
+
+# PROVIDE: mklivecd
+# BEFORE: disks
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="livecd"
+rcvar=$name
+
+start_cmd="livecd_start"
+stop_cmd="livecd_stop"
+
+livecd_start()
+{
+ if [ -f /stand/usr.zfs ]; then
+ echo -n "=> Mounting compressed images: "
+ /rescue/vnconfig -z vnd0 /stand/usr.zfs
+ /rescue/mount -r /dev/vnd0a /usr
+ if [ ! -f /stand/var_db_pkg.zfs ]; then
+ echo "/usr."
+ else
+ /rescue/vnconfig -z vnd1 /stand/var_db_pkg.zfs
+ /rescue/mount -r /dev/vnd1a /var/db/pkg
+ echo "/usr, /var/db/pkg."
+ fi
+ fi
+
+ echo -n "=> Mounting Memory based filesystems: "
+
+ mount_mfs @MNT_DEV_ARGS@ swap /dev
+ echo -n "/dev, "
+
+ mount_mfs @MNT_ETC_ARGS@ swap /etc
+ echo -n "/etc, "
+
+ mount_mfs @MNT_VAR_ARGS@ swap /var
+ echo -n "/var, "
+
+ mount_mfs @MNT_ROOT_ARGS@ swap /root
+ echo -n "/root, "
+
+ mount_mfs @MNT_TMP_ARGS@ swap /tmp
+ echo "/tmp"
+
+ @HOME@
+ @HOMETAR@
+ @USRPKGETC@
+ @USRPKGETCTAR@
+
+ for f in mfs_dev mfs_etc mfs_var mfs_root
+ do
+ @TAR@ xfzp /stand/$f.tgz -C / > /dev/null 2>&1
+ if [ "$?" -eq 0 ]; then
+ echo "=> $f unpacked successfully."
+ else
+ echo "=> $f not unpacked correctly!"
+ fi
+ done
+}
+
+livecd_stop()
+{
+ echo "Please don't do that :-)"
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff -r 63604b9255df -r d4bd1b568750 sysutils/mklivecd/files/mfs_rcd
--- a/sysutils/mklivecd/files/mfs_rcd Thu Aug 11 20:25:20 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-# $NetBSD: mfs_rcd,v 1.5 2005/07/29 12:13:01 xtraeme Exp $
-#
-# Mount mfs directories and unpack the required files
-# before anything.
-
-# PROVIDE: LiveCD
-# BEFORE: disks
-
-. /etc/rc.subr
-
-name="mfsrc"
-rcvar=$name
-
-start_cmd="mfsrc_start"
-stop_cmd="mfsrc_stop"
-
-mfsrc_start()
-{
- echo -n "=> Mounting Memory based filesystems: "
- mount_mfs @MNT_DEV_ARGS@ swap /dev
- echo -n "/dev, "
- mount_mfs @MNT_ETC_ARGS@ swap /etc
- echo -n "/etc, "
- mount_mfs @MNT_VAR_ARGS@ swap /var
- echo -n "/root, "
- mount_mfs @MNT_ROOT_ARGS@ swap /root
- echo "/tmp."
- mount_mfs @MNT_TMP_ARGS@ swap /tmp
- @HOME@
- @HOMETAR@
- @USRPKGETC@
- @USRPKGETCTAR@
-
- for f in mfs_dev mfs_etc mfs_var mfs_root
- do
- @TAR@ xfzp /stand/$f.tgz -C / > /dev/null 2>&1
- if [ "$?" -eq 0 ]; then
- echo "=> $f unpacked successfully."
- else
- echo "=> $f not unpacked correctly!"
- fi
- done
-}
-
-mfsrc_stop()
-{
- echo "Please don't do that :-)"
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff -r 63604b9255df -r d4bd1b568750 sysutils/mklivecd/files/mklivecd.8
--- a/sysutils/mklivecd/files/mklivecd.8 Thu Aug 11 20:25:20 2005 +0000
+++ b/sysutils/mklivecd/files/mklivecd.8 Thu Aug 11 20:48:55 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mklivecd.8,v 1.11 2005/07/29 12:13:01 xtraeme Exp $
+.\" $NetBSD: mklivecd.8,v 1.12 2005/08/11 20:48:55 xtraeme Exp $
.\"
.\" mklivecd - Make your own NetBSD/i386 Live CD-ROM/DVD-ROM
.\"
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 25, 2005
+.Dd August 11, 2005
.Dt MKLIVECD 8
.Os
.Sh NAME
@@ -274,11 +274,26 @@
CDBootloader will be used.
Defaults to
.Sy yes .
+.It VND_COMPRESSION
+Enable this to mount
+.Pa /usr ,
+and
+.Pa /var/db/pkg
+via
+.Xr vnconfig 8
+with compression enabled.
+Note you'll need to have
+.Sy options VND_COMPRESSION
+in your kernel config, at the moment
+this option is only available on
+.Nx
+>=4.0. Defaults to
+.Sy no .
.It MNT_{MOUNT_POINT}_ARGS
This specifies the arguments passed to the
.Xr mount 8
command used in the
-.Pa mfs_rcd
+.Pa livecd
script, when the
.Nx
Live CD is booted.
diff -r 63604b9255df -r d4bd1b568750 sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh Thu Aug 11 20:25:20 2005 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh Thu Aug 11 20:48:55 2005 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mklivecd.sh,v 1.21 2005/07/29 12:13:01 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.22 2005/08/11 20:48:55 xtraeme Exp $
#
# Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,6 +62,7 @@
: ${GRUB_FILES:=stage1 stage2 stage2_eltorito iso9660_stage1_5 \
xfs_stage1_5 ufs2_stage1_5 reiserfs_stage1_5 \
jfs_stage1_5 ffs_stage1_5 fat_stage1_5 e2fs_stage1_5}
+: ${GRUB_BOOT_ARGS:= -boot-load-size 30 -boot-info-table}
#
# Common vars for cdboot/grub.
#
@@ -128,8 +129,9 @@
KERNEL_VARS="MULTIPLE_KERNELS BOOTKERN KERNEL_NAME"
MISC_VARS="ENABLE_X11 MKISOFS_ARGS CDRECORD_ARGS BLANK_BEFORE_BURN \
- CDROM_DEVICE PERSONAL_CONFIG IMAGE_NAME PKG_SYSCONFDIR\
- REMOVE_DIRS USE_GNU_GRUB GRUB_FILES_DIR HOSTNAME"
+ CDROM_DEVICE PERSONAL_CONFIG IMAGE_NAME PKG_SYSCONFDIR \
+ REMOVE_DIRS USE_GNU_GRUB GRUB_FILES_DIR HOSTNAME \
+ VND_COMPRESSION"
MNT_VARS="MNT_ETC_ARGS MNT_VAR_ARGS MNT_ROOT_ARGS \
MNT_TMP_ARGS MNT_HOME_ARGS MNT_PKG_SYSCONFDIR_ARGS \
@@ -167,6 +169,7 @@
: ${REMOVE_DIRS:=altroot usr/share/info}
: ${USE_GNU_GRUB:=yes}
: ${GRUB_FILES_DIR:=@LOCALBASE@/lib/grub/@MACHINE_ARCH@-}
+ : ${VND_COMPRESSION:=no}
#
# Mount arguments
#
@@ -293,9 +296,16 @@
do_menu_lst()
{
- [ -n "$verbose_mode" ] && \
- showmsg_n "Creating $ISODIR/$GRUB_BOOTDIR/menu.lst..."
- if [ ! -f $ISODIR/$GRUB_BOOTDIR/menu.lst ]; then
+ if [ -f $ISODIR/$GRUB_BOOTDIR/menu.lst ]; then
+ showmsg_n "Updating menu.lst..."
+ ( \
+ echo "title NetBSD/$KERNEL_NAME kernel"; \
+ echo "kernel --type=netbsd /$GRUB_BOOTDIR/$BOOTKERN.gz"; \
+ echo; \
+ ) >> $ISODIR/$GRUB_BOOTDIR/menu.lst
+ else
+ [ -n "$verbose_mode" ] && \
+ showmsg_n "Creating $ISODIR/$GRUB_BOOTDIR/menu.lst..."
cat > $ISODIR/$GRUB_BOOTDIR/menu.lst << _EOF_
# Default GRUB menu file created by ${progname}.
# Date: $(date).
@@ -524,7 +534,7 @@
fi
fi # ENABLE_X11
- cp $SHAREDIR/mfs_rcd $ISODIR/etc/rc.d
+ cp $SHAREDIR/livecd $ISODIR/etc/rc.d
# /etc/rc.conf
showmsg_n "Installing configuration files..."
@@ -534,7 +544,7 @@
touch $ISODIR/etc/fstab
( \
- echo "mfsrc=yes"; \
+ echo "livecd=yes"; \
echo "dhclient=yes dhclient_flags=-q"; \
echo "wscons=yes"; \
echo "hostname=$HOSTNAME"; \
@@ -551,7 +561,7 @@
cat > $ISODIR/etc/rc.d/root <<_EOF_
#!/bin/sh
Home |
Main Index |
Thread Index |
Old Index