Index: devel/pb/contrib/pbsetupqemu
===================================================================
--- devel/pb/contrib/pbsetupqemu	(revision 169)
+++ devel/pb/contrib/pbsetupqemu	(revision 171)
@@ -21,7 +21,4 @@
 chmod 0644,$file;
 
-# Sync date
-system "/usr/sbin/ntpdate ntp.home.musique-ancienne.org";
-
 $file="/etc/passwd";
 open(PBFILE,$file) || die "Unable to open $file";
@@ -36,6 +33,12 @@
 		mkdir "/home";
 	}
-	system "useradd pb";
+	system "useradd pb -d /home/pb";
 }
+
+chdir "/home/pb";
+mkdir ".ssh",0700;
+system 'cp /tmp/pbkey .ssh/authorized_keys';
+chmod 0600,".ssh/authorized_keys";
+system 'chown -R pb:pb .ssh';
 
 # No passwd for pb only keys
@@ -68,5 +71,4 @@
 chmod 0440,$file;
 
-system 'su - pb -c "mkdir -p .ssh ; chmod 700 .ssh ; cp /tmp/pbkey .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys"';
 unlink "/tmp/pbkey";
 
@@ -83,6 +85,20 @@
 		$opt="--exclude=*.i?86";
 	}
+
+	my $topbuilddir=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+	chomp($topbuilddir);
+
+	my $p = `rpm -q afio`;
+	chomp($p);
+	if ($p !~ /^afio/) {
+		system "rm -f afio-* ; wget ftp://ftp.mondorescue.org/src/afio-2.4.7-1.src.rpm ; rpm -ivh afio-2.4.7-1.src.rpm ; rpmbuild -ba $topbuilddir/SPECS/afio.spec ; chmod 644 $topbuilddir/RPMS/*/*.rpm";
+	}
+	$p = `rpm -q buffer`;
+	chomp($p);
+	if ($p !~ /^buffer/) {
+		system "rm -f buffer-* ; wget ftp://ftp.mondorescue.org/src/buffer-1.19-1.src.rpm ; rpm -ivh buffer-1.19-1.src.rpm ; rpmbuild -ba $topbuilddir/SPECS/buffer.spec ; chmod 644 $topbuilddir/RPMS/*/*.rpm";
+	}
 	if ( $dver <= 4 ) {
-		# FC4
+		# FC4 - AppConfig unavailable
 		system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
 	} else {
@@ -91,5 +107,10 @@
 	}
 } elsif ( $dfam eq "md" ) {
-	system "urpmi --auto-select 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 ntp-client perl-AppConfig perl-DateManip";
+	if (( $dver eq "2006.0" ) || ( $dver eq "10.2" ) || ( $dver eq "10.1" )) {
+		# mondo not available
+		system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
+	} else {
+		system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mondo mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
+	}
 } elsif ( $dfam eq "du" ) {
 	system "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 ntp-client libncurses5-dev";
@@ -99,4 +120,7 @@
 	print "No pkg to install\n";
 }
+
+# Sync date
+system "/usr/sbin/ntpdate ntp.home.musique-ancienne.org";
 
 # Patch AppConfig