Changeset 1693 in MondoRescue for branches/stable/tools

Timestamp:

Oct 21, 2007, 3:06:22 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Remove useless copy from mindi to mondo at end of USB handling
• Fix PB macro vs tools/*2build issue
• make_usb_fs change of interface (doesn't need a parameter)
• Fix USB support in mondo to avoid multiple copies of files
• Use first partiion in mondo for USB device
• Fixes for USB CLI for both mondo/mindi
• Try to add USB support for mondoarchive with new functions
• du => deb for similarity with other distro type under pbconf
• migrate gento build files under pb
• remove now obsolete rpm spec file and gentoo build files from distributions
• Remove DOCDIR usage in mindi + various build fixes

(merge -r1680:1692 $SVN_M/branches/2.2.5)

Location:

branches/stable/tools

Files:

• qemu-vm.txt (modified) (5 diffs)
• setupqemu (modified) (1 diff)
• updateqemu (copied) (copied from branches/2.2.5/tools/updateqemu )

branches/stable/tools/qemu-vm.txt

@@ -2 +2 @@
 qemu-img create -f qcow2 image.qemu 3G
 qemu -cdrom /dev/hdc -m 256 -boot d image.qemu
+
+# use lilo on recent x86_86 distros as grub doesn't work.
+# on suse make yast2 use the right repositories (Sw/SWrepositories/ remove DVD)
+# # verify root alogin on sshd conf
+grep Root /etc/ssh/sshd_config
+
+# On Ubuntu install openssh-server
+apt-get install openssh-server
+
+# At install on 64 distro use lilo
+# on Ubuntu change tty, kill grub install
+# chroot /target remount cdrom
+# install lilo instead
 
 # Recent SUSE acpi=off
@@ -7 +20 @@
 # RPM based : urpmi, yum install, yast2
 # Mandriva
-urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord pb
-
-#Fedora
-yum install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs pb
-
 
 # gentoo
@@ -23 +31 @@
 apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev pb
 
-# Apply AppConfig path
-patch -p0 < pb-doc/App*
-
 #Changing CD during install:
 Ctrl-Alt-2
@@ -36 +41 @@
 
 #Clé SSH:
+mkdir .ssh
+chmod 700 .ssh
 scp bruno@10.0.2.2:.ssh/id_dsa.pub /root/.ssh/authorized_keys
 chmod 600 /root/.ssh/authorized_keys
-
-#Créer compte pb
-useradd pb
-
-# No passwd for pb
-perl -pi -e 's/^pb:\!\!:/pb:*:/' /etc/shadow
-# Adapt sudoers
-echo "pb   ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-# poweroff only
-
-su - pb
-mkdir ~/.ssh
-chmod 700 ~/.ssh
-scp -p victoria2.home.musique-ancienne.org:.ssh/id_dsa.pub ~/.ssh/authorized_keys
-# Passwd asked above
-chmod 600 ~/.ssh/authorized_keys
 
 #rebuild paquets necessaires mondo:
@@ -64 +55 @@
 chmod 644 build/RPMS/i386/*
 scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
-
-# Exchange host keys with www.mondorescue.org
-ssh www.mondorescue.org ls
-
 
 root:

branches/stable/tools/setupqemu

@@ -3 +3 @@
 (
 if [ _"$1" == _"" ]; then
-    echo "Syntax: setupqemu VM"
+    echo "Syntax: setupqemu VM|all"
     exit -1
 fi
 cat /users/bruno/pb/svn/devel/pb/contrib/pbsetupqemu /users/bruno/pb/svn/devel/pb/lib/ProjectBuilder/Distribution.pm > /tmp/pbscript
-for m in $*; do
-    pb -r `pwd` -p mondorescue -m $m -a root -s /tmp/pbscript script2vm ; pb -p mondorescue -m $m build2vm
+if [ _"$1" == "all" ]; then
+    pb -r `pwd` -p mondorescue -a root -s /tmp/pbscript script2vm
     ssh -p 2222 root@localhost halt
     sleep 120
-    ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill -9
-done
+    ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill
+else
+    for m in $*; do
+        pb -r `pwd` -p mondorescue -m $m -a root -s /tmp/pbscript script2vm ; pb -p mondorescue -m $m build2vm
+        #ssh -p 2222 root@localhost halt
+        #sleep 120
+        #ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill -9
+    done
+fi
 ) 2>&1 | tee /tmp/setupqemu.log