Browse Source

added UGROUPS=wheel in vbuilder.console; supported 6.0_i386 and 6.0_x86_64

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@4070 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
54c8767d48

+ 4 - 2
vbootstrap-vl.spec

@@ -1,7 +1,7 @@
 # This package is maintained on trac svn repository. Please do not change on local.
 # If you find a BUG, please report to Vine@vinelinux.org or mailing list or BTS.
 
-%define version 0.0.43
+%define version 0.0.44
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -80,9 +80,11 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
-* Tue May 31 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.44-1
+* Mon Jun 06 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.44-1
 - updated vbuilder
   - allowed some illegal patterns of %%{release}
+- added UGROUPS=wheel in vbuilder.console
+- supported 6.0_i386 and 6.0_x86_64
 
 * Sat Apr 30 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.43-1
 - updated vbootstrap

+ 24 - 0
vbootstrap/scripts/6.0_i386.sh

@@ -0,0 +1,24 @@
+# 6.0_i386
+
+INSTVER="6.0_i386"
+BASE_PKGS="setup glibc coreutils bash apt rootfiles vine-release libstdc++34"
+APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
+
+vbootstrap_post()
+{
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+cp -a /etc/resolv.conf $INSTDIR/etc/
+rm -f $INSTDIR/var/lib/rpm/*
+echo -n $" reinitializing rpm database... "
+chroot $INSTDIR rpm --initdb
+echo $"DONE."
+echo -n $" updating apt database... "
+chroot $INSTDIR apt-get -qq update
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
+chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
+echo $"DONE."
+#echo $" installing vine-keyring... "
+#chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+#echo $"DONE."
+}

+ 24 - 0
vbootstrap/scripts/6.0_x86_64.sh

@@ -0,0 +1,24 @@
+# 6.0_x86_64
+
+INSTVER="6.0_x86_64"
+BASE_PKGS="setup glibc coreutils bash apt rootfiles vine-release libstdc++34"
+APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
+
+vbootstrap_post()
+{
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+cp -a /etc/resolv.conf $INSTDIR/etc/
+rm -f $INSTDIR/var/lib/rpm/*
+echo -n $" reinitializing rpm database... "
+chroot $INSTDIR rpm --initdb
+echo $"DONE."
+echo -n $" updating apt database... "
+chroot $INSTDIR apt-get -qq update
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
+chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
+echo $"DONE."
+#echo $" installing vine-keyring... "
+#chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+#echo $"DONE."
+}

+ 1 - 0
vbootstrap/sources.list.d/6.0_i386

@@ -0,0 +1 @@
+rpm http://updates.vinelinux.org/apt 6.0/i386 main plus nonfree

+ 1 - 0
vbootstrap/sources.list.d/6.0_x86_64

@@ -0,0 +1 @@
+rpm http://updates.vinelinux.org/apt 6.0/x86_64 main plus nonfree

+ 1 - 1
vbuilder.console

@@ -2,4 +2,4 @@ FALLBACK=false
 PROGRAM=/usr/sbin/vbuilder
 GUI=no
 USER=root
-# UGROUPS=wheel
+UGROUPS=wheel