Changeset 1633


Ignore:
Timestamp:
Sep 12, 2007, 8:33:49 PM (12 years ago)
Author:
bruno
Message:

Fix #195 (patch from Scott Cummings)
Various pb updates

(merge -r1623:1632 $SVN_M/branches/2.2.5)

Location:
branches/stable
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

    r1594 r1633  
    370370            mr_free(tarball_fname);
    371371            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
     372                    current_tarball_number);
     373        }
     374        if (!does_file_exist(tarball_fname)) {
     375            mr_free(tarball_fname);
     376            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.gz",
    372377                    current_tarball_number);
    373378        }
  • branches/stable/pbconf/mindi/pbfilter/rpm.pbf

    r1603 r1633  
    3131filter PBPKG = $pbpkg
    3232
     33# PBSUF is replaced by the package name ($pbsuf in code)
     34filter PBSUF = $pbsuf
     35
    3336# PBOBS is replaced by the Obsolete line
    3437filter PBOBS =
  • branches/stable/pbconf/mindi/rpm/mindi.spec

    r1593 r1633  
    55Name:       PBPKG
    66Version:    PBVER
    7 Release:    PBTAG
     7Release:    PBTAGPBSUF
    88License:    GPL
    99Group:      PBGRP
  • branches/stable/pbconf/mondo/pbfilter/rpm.pbf

    r1603 r1633  
    3131filter PBPKG = $pbpkg
    3232
     33# PBSUF is replaced by the package name ($pbsuf in code)
     34filter PBSUF = $pbsuf
     35
    3336# PBOBS is replaced by the Obsolete line
    3437filter PBOBS =
  • branches/stable/pbconf/mondo/rpm/mondo.spec

    r1603 r1633  
    1010Name:       PBPKG
    1111Version:    PBVER
    12 Release:    PBTAG
     12Release:    PBTAGPBSUF
    1313License:    GPL
    1414Group:      PBGRP
  • branches/stable/tools/qemu-vm.txt

    r1539 r1633  
    77# RPM based : urpmi, yum install, yast2
    88# Mandriva
    9 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
     9urpmi 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
    1010
    1111#Fedora
    12 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
     12yum 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
    1313
    1414
    1515# gentoo
    1616#Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
    17 emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue sudo jadetex docbook2ps # cdrecord mkisofs
     17emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue sudo jadetex docbook2ps pb # cdrecord mkisofs
    1818
    1919# Slackware
     
    2121#
    2222# Ubuntu
    23 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
     23apt-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
     24
     25# Apply AppConfig path
     26patch -p0 < pb-doc/App*
    2427
    2528#Changing CD during install:
     
    3336
    3437#Clé SSH:
    35 #   Ajout clé ssh pour root:
    36 mkdir /root/.ssh
    37 chmod 700 /root/.ssh
    3838scp bruno@10.0.2.2:.ssh/id_dsa.pub /root/.ssh/authorized_keys
    3939chmod 600 /root/.ssh/authorized_keys
    4040
    41 #Créer compte bruno avec répertoires nécéssaires + env necessaire
    42 mkdir /users
    43 useradd bruno -d /users/bruno
    44 passwd bruno
     41#Créer compte pb
     42useradd pb
    4543
    46 # Remote connection looks like:
    47 ssh -p 2223 -o UserKnownHostsFile=/tmp/1 bruno@localhost
     44# No passwd for pb
     45perl -pi -e 's/^pb:\!\!:/pb:*:/' /etc/shadow
     46# Adapt sudoers
     47echo "pb   ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
     48# poweroff only
    4849
    49 # Or locally
    50 su - bruno
    51 mkdir -p mondo/tmp build
    52 cat > ~bruno/.rpmmacros << EOF
    53 %_topdir    /users/bruno/build
    54 %_tmppath   %{_topdir}/tmp
    55 %packager   Bruno Cornec <bruno@mondorescue.org>
    56 EOF
    57 cat > ~bruno/.rpmrc << EOF
    58 buildarchtranslate: i386: i386
    59 buildarchtranslate: i486: i386
    60 buildarchtranslate: i586: i386
    61 buildarchtranslate: i686: i386
    62 EOF
     50su - pb
    6351mkdir ~/.ssh
    6452chmod 700 ~/.ssh
    65 scp -p victoria2.home.musique-ancienne.org:.ssh/id'*' ~/.ssh
     53scp -p victoria2.home.musique-ancienne.org:.ssh/id_dsa.pub ~/.ssh/authorized_keys
    6654# Passwd asked above
    67 cp ~/.ssh/id_dsa.pub ~/.ssh/authorized_keys
    6855chmod 600 ~/.ssh/authorized_keys
    69 
    70 cat >> ~/.ssh/known_hosts << EOF
    71 shell.berlios.de,195.37.77.140 ssh-dss AAAAB3NzaC1kc3MAAACBAKawwrOuxejvOTWc6zFKEs2KKzVDXchPICt0p5A6LuIeIX+Uw9QMM5hji7txwuNt+ErPX/Z9xd1OBKAsormCMe6BZaxi0KMyFHPTnFTJpy168ztBD+782fQwlvop9nNRWkKoY1BGqQvKX50Zj+mQ39VP+RgJsyDMl+sKA3OqtGcVAAAAFQCBx79R1fUfJgOAVKxrCnvCu2vQRQAAAIBq5Li0/Fdf0yL/fSv6q8OZLCUgjMk6agnNbMxSK35Vctx0E4KXQbIJTmpwZIgYdZm+S2LYe0EgEYcWyBgcll1kK5Rti2e71sVuSoRNCo+rD8bsBcIETENtHZYuAeAWBlwrvT5LReGRpJ1YMNQpXXq4mQFbmhuhgJw9nKyt5xv6bgAAAIAro+dquEuGy32MOLcSqHtJm/FA+3FRG0RbLS8VDtxVC3ISe3SlSM0BecIHZ6aP5dL5W2b39/U2clls05X23SRK68DSqxoR/o9YshKdshDkPGEDfqyucOCn5FwUsZkd/WkZIuBZdLHLUtXUK6h85+08t5gmaL8eoXoOvHpsuCnNdA==
    72 svn.berlios.de,195.37.77.137 ssh-dss AAAAB3NzaC1kc3MAAACBAKouB77l1f4FgdP6DjLOgq5RKuGYm3zMJlM4WHcKzWnPuErZW4Omxk1CO0JojDNj/bjxz/95blWbdonEcAo0v71GcZbECFDsJdgVbZM+yxLHKOF4S5uHkiJ+LMawFcRoCGAochowoP9jUfLVAzyT1q3dbvmL43YO3FDvD+mCKTbZAAAAFQCWs/2nOqvitE/CyOCa81sadnzsPQAAAIBrgWRs2VN6jAtX1eUxPwtkJWX886DkiBwdEgtUwDW8RJJCFU6+zjNwFZ8VcjeA7OCFKmZqoD8ABojMMtB53VoXXRzp5PtWgJEMpCLOhHbAA6nLR+Zu9zV8rFHsrjvR17ZgmA8q1dZRqqvZSyzsoP4KdW7f9nD2SjFEVhjHfIsQmwAAAIEAoDlEoGO/lc8XkvNW7G8/rybzETG0cepONVKThYufP5Z2FdGj9a1TYc2Gaw2DygM20Ohwj1RW8aeRE/jYbEm4unM6IFYeLvCbDeeCCHCiCJmw/Pj2ityB5uPTat4Yn28FCd4eP5LyQq2EHz6bPA0LzpNJKwto4naIMsDpET1GNH0=
    73 EOF
    7456
    7557#rebuild paquets necessaires mondo:
     
    7860rpm -ivh afio-2.4.7-1.src.rpm buffer-1.19-1.src.rpm
    7961mkdir -p build/BUILD build/RPMS/i386 build/SRPMS
    80 rpmbuild -ba build/SPECS/afio.spec
    81 rpmbuild -ba build/SPECS/buffer.spec
     62rpmbuild --define "_topdir $HOME/build" -ba build/SPECS/afio.spec
     63rpmbuild --define "_topdir $HOME/build" -ba build/SPECS/buffer.spec
    8264chmod 644 build/RPMS/i386/*
    8365scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
     
    8971root:
    9072rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
    91 
    92 # Adapt sudoers
    9373
    9474# For RHAS 2.1 add grep-2.5.1
Note: See TracChangeset for help on using the changeset viewer.