*** empty log message ***

3 files changed, 521 insertions, 67 deletions

diff --git a/sys-apps/yard/files/yard-2.0/etc/Bootdisk_Contents b/sys-apps/yard/files/yard-2.0/etc/Bootdisk_Contents
index 15110ff5ab87..e49db536cf1b 100644
--- a/sys-apps/yard/files/yard-2.0/etc/Bootdisk_Contents
+++ b/sys-apps/yard/files/yard-2.0/etc/Bootdisk_Contents
@@ -32,26 +32,143 @@
 #  unless you just want them to exist.
 #
 
+#Busybox
+/bin/busybox <= /bin/busybox
+#/bin/ar -> /bin/busybox
+/bin/basename -> /bin/busybox
+/bin/cat -> /bin/busybox
+/bin/chgrp -> /bin/busybox
+/bin/chmod -> /bin/busybox
+/bin/chown -> /bin/busybox
+/bin/chroot -> /bin/busybox
+/bin/chvt -> /bin/busybox
+/bin/clear -> /bin/busybox
+#/bin/cmp -> /bin/busybox
+/bin/cp -> /bin/busybox
+/bin/cut -> /bin/busybox
+/bin/date -> /bin/busybox
+/bin/dc -> /bin/busybox
+/bin/dd -> /bin/busybox
+#/bin/deallocvt -> /bin/busybox
+/bin/df -> /bin/busybox
+/bin/dirname -> /bin/busybox
+/bin/dmesg -> /bin/busybox
+#/bin/dos2unix -> /bin/busybox
+#/bin/dpkg -> /bin/busybox
+#/bin/dpkg-deb -> /bin/busybox
+/bin/du -> /bin/busybox
+/bin/dumpkmap -> /bin/busybox
+/bin/dutmp -> /bin/busybox
+/bin/echo -> /bin/busybox
+/bin/expr -> /bin/busybox
+/bin/false -> /bin/busybox
+/bin/fbset -> /bin/busybox
+/bin/fdflush -> /bin/busybox
+/bin/find -> /bin/busybox
+/bin/free -> /bin/busybox
+#/bin/freeramdisk -> /bin/busybox
+#/bin/fsck.minix -> /bin/busybox
+/bin/getopt -> /bin/busybox
+/bin/grep -> /bin/busybox
+/bin/gunzip -> /bin/busybox
+/bin/gzip -> /bin/busybox
+/bin/halt -> /bin/busybox
+/bin/head -> /bin/busybox
+/bin/hostid -> /bin/busybox
+/bin/hostname -> /bin/busybox
+/bin/id -> /bin/busybox
+/bin/ifconfig -> /bin/busybox
+/bin/init -> /bin/busybox
+/bin/insmod -> /bin/busybox
+/bin/kill -> /bin/busybox
+/bin/killall -> /bin/busybox
+/bin/klogd -> /bin/busybox
+#/bin/length -> /bin/busybox
+/bin/ln -> /bin/busybox
+/bin/loadacm -> /bin/busybox
+/bin/loadfont -> /bin/busybox
+/bin/loadkmap -> /bin/busybox
+/bin/logger -> /bin/busybox
+/bin/logname -> /bin/busybox
+/bin/ls -> /bin/busybox
+/bin/lsmod -> /bin/busybox
+/bin/makedev -> /bin/busybox
+/bin/md5sum -> /bin/busybox
+/bin/mkdir -> /bin/busybox
+/bin/mkfifo -> /bin/busybox
+#/bin/mkfs.minix -> /bin/busybox
+/bin/mknod -> /bin/busybox
+/bin/mkswap -> /bin/busybox
+/bin/mktemp -> /bin/busybox
+/bin/more -> /bin/busybox
+/bin/mount -> /bin/busybox
+/bin/mt -> /bin/busybox
+/bin/mv -> /bin/busybox
+#/bin/nc -> /bin/busybox
+/bin/nslookup -> /bin/busybox
+/bin/ping -> /bin/busybox
+#/bin/pivot_root -> /bin/busybox
+/bin/poweroff -> /bin/busybox
+#/bin/printf -> /bin/busybox
+/bin/ps -> /bin/busybox
+/bin/pwd -> /bin/busybox
+#/bin/rdate -> /bin/busybox
+/bin/readlink -> /bin/busybox
+/sbin/reboot -> /bin/busybox
+/bin/renice -> /bin/busybox
+/bin/reset -> /bin/busybox
+/bin/rm -> /bin/busybox
+/bin/rmdir -> /bin/busybox
+/bin/rmmod -> /bin/busybox
+/bin/route -> /bin/busybox
+#/bin/rpmunpack -> /bin/busybox
+/bin/sed -> /bin/busybox
+/bin/setkeycodes -> /bin/busybox
+/bin/sh -> /bin/busybox
+/bin/sleep -> /bin/busybox
+/bin/sort -> /bin/busybox
+/bin/stty -> /bin/busybox
+/sbin/swapoff -> /bin/busybox
+/sbin/swapon -> /bin/busybox
+/bin/sync -> /bin/busybox
+/bin/syslogd -> /bin/busybox
+/bin/tail -> /bin/busybox
+/bin/tar -> /bin/busybox
+/bin/tee -> /bin/busybox
+/bin/telnet -> /bin/busybox
+/bin/test -> /bin/busybox
+/bin/tftp -> /bin/busybox
+/bin/touch -> /bin/busybox
+/bin/tr -> /bin/busybox
+/bin/true -> /bin/busybox
+/bin/tty -> /bin/busybox
+/bin/umount -> /bin/busybox
+/bin/uname -> /bin/busybox
+/bin/uniq -> /bin/busybox
+/bin/unix2dos -> /bin/busybox
+/bin/update -> /bin/busybox
+/bin/uptime -> /bin/busybox
+/bin/usleep -> /bin/busybox
+#/bin/uudecode -> /bin/busybox
+#/bin/uuencode -> /bin/busybox
+#/bin/watchdog -> /bin/busybox
+/bin/wc -> /bin/busybox
+/bin/wget -> /bin/busybox
+/bin/which -> /bin/busybox
+/bin/whoami -> /bin/busybox
+/bin/xargs -> /bin/busybox
+/bin/yes -> /bin/busybox
+/bin/zcat -> /bin/busybox
 #  Specify these absolutely because boot scripts need them to be here.
-/bin/cat
-/bin/hostname		   	
-/bin/ln			   	
-/bin/login		   	
-/bin/ls			   	
-/bin/mv			   	
 
-#  Use ash or some suitably minimal shell
-/bin/sh -> ash
+/bin/login
 
+#  Use ash or some suitably minimal shell
+/bin/ash <= Replacements/bin/ash
+/bin/sh -> /bin/ash
 /sbin/agetty
-/sbin/halt          
-/sbin/init		   	
-#/sbin/ldconfig
-/bin/mount         
-/sbin/reboot
-/sbin/shutdown      
-/sbin/swapoff       
-/sbin/swapon        
+/sbin/init
+/sbin/shutdown
 
 #  Devices
 #/dev/ftape	/dev/nftape
@@ -63,11 +180,15 @@
 /dev/tty[0-9]
 /dev/fd0*
 /dev/cu*
+/dev/sda*
+/dev/sdb*
+/dev/sdc*
+/dev/sdd*
 
-/etc/group		   	
-#/etc/issue		   	
+/etc/group
+#/etc/issue
 
-#  These get replaced with their pared-down versions 
+#  These get replaced with their pared-down versions
 #  in the Replacements subdirectory.
 /etc/fstab	<= Replacements/etc/fstab
 /etc/inittab	<= Replacements/etc/inittab.agetty
@@ -80,7 +201,7 @@
 
 #   PROVISIONS FOR PAM:
 /etc/pam.conf	<= ./Replacements/etc/pam.conf
-/lib/security/pam_permit.so	
+/lib/security/pam_permit.so
 
 #   PROVISIONS FOR NSS
 #   If you use old libc5, you don't need this.  Comment out these lines.
@@ -88,9 +209,10 @@
 /etc/nsswitch.conf <= ./Replacements/etc/nsswitch.conf
 #   Check your version of libc and comment out the one you don't need:
 /lib/libnss_files.so.2   # If you use use libc-2.1.X
-
+/lib/libnss_dns.so.2
+/lib/libresolv.so.2
 #  Initialize utmp and wtmp.  Set up links for any old-style programs
-#  that expect them in /etc.  
+#  that expect them in /etc.
 /etc/utmp     -> /var/run/utmp
 /var/run/utmp <= /dev/null        # This clears utmp
 
@@ -98,53 +220,42 @@
 /var/log/wtmp <= /dev/null
 
 #  Directories with nothing otherwise in them:
-/mnt                
-/proc               
-/tmp                
+/mnt
+/proc
+/tmp
 /root
 /dev/pts
 
 #  Utilities.  The script will figure out their locations.
-bzip2
-chmod		   	
-chown		   	
-chroot
-cp			   	
-date		   	
-dd			   	
-df			   	
-du			   	
-#e2fsck        
-fdisk         
-find       
-#fsck          
-#fsck.ext2     
-grep       
-gunzip		   	
-gzip
-less		   	
-mkdir		   	
-#mke2fs        
-#mkfs          
-#mkfs.ext2     
-#mknod	
-mkreiserfs	   	
-#mkswap        
-#passwd		   	
-pwd
-reboot		   	
-rm			   	
-stty		   	
-sync          
-tar
-tail		   	
-touch		   	
-tr
-umount        
-uname
-whoami
-wc
+/usr/bin/bzip2 <= Replacements/bin/bzip2
+#/bin/hostname <= Replacements/bin/hostname
+/usr/bin/fdisk <= Replacements/bin/fdisk
+less
+mke2fs
+mkreiserfs
+dhcpcd
+##### LVM utilities
+pvcreate
+vgcreate
+lvcreate
+pvdisplay
+lvdisplay
+vgdisplay
+vgchange
+vgscan
 
+# PCMCIA stuff
+/sbin/cardmgr
+/etc/rc.d/init.d/pcmcia
+# Modules stuff
+/lib/modules
+/lib/modules/2.4.4-ac5
+/lib/modules/2.4.4-ac5/modules.dep
+/lib/modules/2.4.4-ac5/kernel/drivers/net/tulip/tulip.o
+/lib/modules/2.4.4-ac5/pcmcia/i82365.o
+/lib/modules/2.4.4-ac5/pcmcia/pcmcia_core.o
+/lib/modules/2.4.4-ac5/pcmcia/ds.o
+/lib/modules/2.4.4-ac5/pcmcia/3c*
 #####  End of Bootdisk_Contents
 
 /dev/hda <= Replacements/dev/hda
diff --git a/sys-apps/yard/files/yard-2.0/etc/Bootdisk_Contents.old b/sys-apps/yard/files/yard-2.0/etc/Bootdisk_Contents.old
new file mode 100644
index 000000000000..15110ff5ab87
--- /dev/null
+++ b/sys-apps/yard/files/yard-2.0/etc/Bootdisk_Contents.old
@@ -0,0 +1,334 @@
+#  -*- Mode: Fundamental -*-
+#
+#  This is a pared-down Bootdisk_Contents file for use with Yard.
+#  You can certainly boot with fewer files than this, but you
+#  probably wouldn't want to.  With these you can at least
+#  do some basic disk maintenance.
+#
+#  Format rules:
+#  - Lines beginning with # or % are comments.
+#
+#  - Blank lines and whitespace may be used freely.
+#
+#  - Filenames may be either relative or absolute.
+#
+#  - Lines of the form "filename1 -> filename2" will create
+#    links on the boot disk.  Eg, if you want sh linked to bash
+#    on the bootdisk, you can specify: "/bin/sh -> /bin/bash"
+#
+#  - Lines of the form "filename1 <= filename2"
+#    will cause filename2 (relative to the current working directory)
+#    to be copied to filename1 on the boot disk.  This is useful for
+#    specifying trimmed-down replacements for /etc/passwd, /etc/inittab, etc.
+#
+#  - Wildcards (? and *) are generally allowed, eg /dev/*
+#    Wildcards are not allowed in link specs or replacement specs.
+#
+#  You don't need to specify shared libraries or ld.so*.  The
+#  script will detect dependencies (via ldd) and include them
+#  automatically.
+#
+#  You don't need to explicitly specify intermediate directories
+#  unless you just want them to exist.
+#
+
+#  Specify these absolutely because boot scripts need them to be here.
+/bin/cat
+/bin/hostname		   	
+/bin/ln			   	
+/bin/login		   	
+/bin/ls			   	
+/bin/mv			   	
+
+#  Use ash or some suitably minimal shell
+/bin/sh -> ash
+
+/sbin/agetty
+/sbin/halt          
+/sbin/init		   	
+#/sbin/ldconfig
+/bin/mount         
+/sbin/reboot
+/sbin/shutdown      
+/sbin/swapoff       
+/sbin/swapon        
+
+#  Devices
+#/dev/ftape	/dev/nftape
+/dev/mem	/dev/kmem
+/dev/null
+/dev/zero
+/dev/rd/0
+/dev/console
+/dev/tty[0-9]
+/dev/fd0*
+/dev/cu*
+
+/etc/group		   	
+#/etc/issue		   	
+
+#  These get replaced with their pared-down versions 
+#  in the Replacements subdirectory.
+/etc/fstab	<= Replacements/etc/fstab
+/etc/inittab	<= Replacements/etc/inittab.agetty
+/etc/motd	<= Replacements/etc/bootdisk_motd
+/etc/passwd	<= Replacements/etc/passwd
+/etc/rc		<= Replacements/etc/rc
+/etc/ttytype    <= Replacements/etc/ttytype
+/etc/gettydefs  <= Replacements/etc/gettydefs
+/etc/profile    <= Replacements/etc/profile
+
+#   PROVISIONS FOR PAM:
+/etc/pam.conf	<= ./Replacements/etc/pam.conf
+/lib/security/pam_permit.so	
+
+#   PROVISIONS FOR NSS
+#   If you use old libc5, you don't need this.  Comment out these lines.
+#
+/etc/nsswitch.conf <= ./Replacements/etc/nsswitch.conf
+#   Check your version of libc and comment out the one you don't need:
+/lib/libnss_files.so.2   # If you use use libc-2.1.X
+
+#  Initialize utmp and wtmp.  Set up links for any old-style programs
+#  that expect them in /etc.  
+/etc/utmp     -> /var/run/utmp
+/var/run/utmp <= /dev/null        # This clears utmp
+
+/etc/wtmp     -> /var/log/wtmp
+/var/log/wtmp <= /dev/null
+
+#  Directories with nothing otherwise in them:
+/mnt                
+/proc               
+/tmp                
+/root
+/dev/pts
+
+#  Utilities.  The script will figure out their locations.
+bzip2
+chmod		   	
+chown		   	
+chroot
+cp			   	
+date		   	
+dd			   	
+df			   	
+du			   	
+#e2fsck        
+fdisk         
+find       
+#fsck          
+#fsck.ext2     
+grep       
+gunzip		   	
+gzip
+less		   	
+mkdir		   	
+#mke2fs        
+#mkfs          
+#mkfs.ext2     
+#mknod	
+mkreiserfs	   	
+#mkswap        
+#passwd		   	
+pwd
+reboot		   	
+rm			   	
+stty		   	
+sync          
+tar
+tail		   	
+touch		   	
+tr
+umount        
+uname
+whoami
+wc
+
+#####  End of Bootdisk_Contents
+
+/dev/hda <= Replacements/dev/hda
+/dev/hda1 <= Replacements/dev/hda1
+/dev/hda10 <= Replacements/dev/hda10
+/dev/hda11 <= Replacements/dev/hda11
+/dev/hda12 <= Replacements/dev/hda12
+/dev/hda13 <= Replacements/dev/hda13
+/dev/hda14 <= Replacements/dev/hda14
+/dev/hda15 <= Replacements/dev/hda15
+/dev/hda16 <= Replacements/dev/hda16
+/dev/hda17 <= Replacements/dev/hda17
+/dev/hda18 <= Replacements/dev/hda18
+/dev/hda19 <= Replacements/dev/hda19
+/dev/hda2 <= Replacements/dev/hda2
+/dev/hda20 <= Replacements/dev/hda20
+/dev/hda3 <= Replacements/dev/hda3
+/dev/hda4 <= Replacements/dev/hda4
+/dev/hda5 <= Replacements/dev/hda5
+/dev/hda6 <= Replacements/dev/hda6
+/dev/hda7 <= Replacements/dev/hda7
+/dev/hda8 <= Replacements/dev/hda8
+/dev/hda9 <= Replacements/dev/hda9
+/dev/hdb <= Replacements/dev/hdb
+/dev/hdb1 <= Replacements/dev/hdb1
+/dev/hdb10 <= Replacements/dev/hdb10
+/dev/hdb11 <= Replacements/dev/hdb11
+/dev/hdb12 <= Replacements/dev/hdb12
+/dev/hdb13 <= Replacements/dev/hdb13
+/dev/hdb14 <= Replacements/dev/hdb14
+/dev/hdb15 <= Replacements/dev/hdb15
+/dev/hdb16 <= Replacements/dev/hdb16
+/dev/hdb17 <= Replacements/dev/hdb17
+/dev/hdb18 <= Replacements/dev/hdb18
+/dev/hdb19 <= Replacements/dev/hdb19
+/dev/hdb2 <= Replacements/dev/hdb2
+/dev/hdb20 <= Replacements/dev/hdb20
+/dev/hdb3 <= Replacements/dev/hdb3
+/dev/hdb4 <= Replacements/dev/hdb4
+/dev/hdb5 <= Replacements/dev/hdb5
+/dev/hdb6 <= Replacements/dev/hdb6
+/dev/hdb7 <= Replacements/dev/hdb7
+/dev/hdb8 <= Replacements/dev/hdb8
+/dev/hdb9 <= Replacements/dev/hdb9
+/dev/hdc <= Replacements/dev/hdc
+/dev/hdc1 <= Replacements/dev/hdc1
+/dev/hdc10 <= Replacements/dev/hdc10
+/dev/hdc11 <= Replacements/dev/hdc11
+/dev/hdc12 <= Replacements/dev/hdc12
+/dev/hdc13 <= Replacements/dev/hdc13
+/dev/hdc14 <= Replacements/dev/hdc14
+/dev/hdc15 <= Replacements/dev/hdc15
+/dev/hdc16 <= Replacements/dev/hdc16
+/dev/hdc17 <= Replacements/dev/hdc17
+/dev/hdc18 <= Replacements/dev/hdc18
+/dev/hdc19 <= Replacements/dev/hdc19
+/dev/hdc2 <= Replacements/dev/hdc2
+/dev/hdc20 <= Replacements/dev/hdc20
+/dev/hdc3 <= Replacements/dev/hdc3
+/dev/hdc4 <= Replacements/dev/hdc4
+/dev/hdc5 <= Replacements/dev/hdc5
+/dev/hdc6 <= Replacements/dev/hdc6
+/dev/hdc7 <= Replacements/dev/hdc7
+/dev/hdc8 <= Replacements/dev/hdc8
+/dev/hdc9 <= Replacements/dev/hdc9
+/dev/hdd <= Replacements/dev/hdd
+/dev/hdd1 <= Replacements/dev/hdd1
+/dev/hdd10 <= Replacements/dev/hdd10
+/dev/hdd11 <= Replacements/dev/hdd11
+/dev/hdd12 <= Replacements/dev/hdd12
+/dev/hdd13 <= Replacements/dev/hdd13
+/dev/hdd14 <= Replacements/dev/hdd14
+/dev/hdd15 <= Replacements/dev/hdd15
+/dev/hdd16 <= Replacements/dev/hdd16
+/dev/hdd17 <= Replacements/dev/hdd17
+/dev/hdd18 <= Replacements/dev/hdd18
+/dev/hdd19 <= Replacements/dev/hdd19
+/dev/hdd2 <= Replacements/dev/hdd2
+/dev/hdd20 <= Replacements/dev/hdd20
+/dev/hdd3 <= Replacements/dev/hdd3
+/dev/hdd4 <= Replacements/dev/hdd4
+/dev/hdd5 <= Replacements/dev/hdd5
+/dev/hdd6 <= Replacements/dev/hdd6
+/dev/hdd7 <= Replacements/dev/hdd7
+/dev/hdd8 <= Replacements/dev/hdd8
+/dev/hdd9 <= Replacements/dev/hdd9
+/dev/hde <= Replacements/dev/hde
+/dev/hde1 <= Replacements/dev/hde1
+/dev/hde10 <= Replacements/dev/hde10
+/dev/hde11 <= Replacements/dev/hde11
+/dev/hde12 <= Replacements/dev/hde12
+/dev/hde13 <= Replacements/dev/hde13
+/dev/hde14 <= Replacements/dev/hde14
+/dev/hde15 <= Replacements/dev/hde15
+/dev/hde16 <= Replacements/dev/hde16
+/dev/hde17 <= Replacements/dev/hde17
+/dev/hde18 <= Replacements/dev/hde18
+/dev/hde19 <= Replacements/dev/hde19
+/dev/hde2 <= Replacements/dev/hde2
+/dev/hde20 <= Replacements/dev/hde20
+/dev/hde3 <= Replacements/dev/hde3
+/dev/hde4 <= Replacements/dev/hde4
+/dev/hde5 <= Replacements/dev/hde5
+/dev/hde6 <= Replacements/dev/hde6
+/dev/hde7 <= Replacements/dev/hde7
+/dev/hde8 <= Replacements/dev/hde8
+/dev/hde9 <= Replacements/dev/hde9
+/dev/hdf <= Replacements/dev/hdf
+/dev/hdf1 <= Replacements/dev/hdf1
+/dev/hdf10 <= Replacements/dev/hdf10
+/dev/hdf11 <= Replacements/dev/hdf11
+/dev/hdf12 <= Replacements/dev/hdf12
+/dev/hdf13 <= Replacements/dev/hdf13
+/dev/hdf14 <= Replacements/dev/hdf14
+/dev/hdf15 <= Replacements/dev/hdf15
+/dev/hdf16 <= Replacements/dev/hdf16
+/dev/hdf17 <= Replacements/dev/hdf17
+/dev/hdf18 <= Replacements/dev/hdf18
+/dev/hdf19 <= Replacements/dev/hdf19
+/dev/hdf2 <= Replacements/dev/hdf2
+/dev/hdf20 <= Replacements/dev/hdf20
+/dev/hdf3 <= Replacements/dev/hdf3
+/dev/hdf4 <= Replacements/dev/hdf4
+/dev/hdf5 <= Replacements/dev/hdf5
+/dev/hdf6 <= Replacements/dev/hdf6
+/dev/hdf7 <= Replacements/dev/hdf7
+/dev/hdf8 <= Replacements/dev/hdf8
+/dev/hdf9 <= Replacements/dev/hdf9
+/dev/hdg <= Replacements/dev/hdg
+/dev/hdg1 <= Replacements/dev/hdg1
+/dev/hdg10 <= Replacements/dev/hdg10
+/dev/hdg11 <= Replacements/dev/hdg11
+/dev/hdg12 <= Replacements/dev/hdg12
+/dev/hdg13 <= Replacements/dev/hdg13
+/dev/hdg14 <= Replacements/dev/hdg14
+/dev/hdg15 <= Replacements/dev/hdg15
+/dev/hdg16 <= Replacements/dev/hdg16
+/dev/hdg17 <= Replacements/dev/hdg17
+/dev/hdg18 <= Replacements/dev/hdg18
+/dev/hdg19 <= Replacements/dev/hdg19
+/dev/hdg2 <= Replacements/dev/hdg2
+/dev/hdg20 <= Replacements/dev/hdg20
+/dev/hdg3 <= Replacements/dev/hdg3
+/dev/hdg4 <= Replacements/dev/hdg4
+/dev/hdg5 <= Replacements/dev/hdg5
+/dev/hdg6 <= Replacements/dev/hdg6
+/dev/hdg7 <= Replacements/dev/hdg7
+/dev/hdg8 <= Replacements/dev/hdg8
+/dev/hdg9 <= Replacements/dev/hdg9
+/dev/hdh <= Replacements/dev/hdh
+/dev/hdh1 <= Replacements/dev/hdh1
+/dev/hdh10 <= Replacements/dev/hdh10
+/dev/hdh11 <= Replacements/dev/hdh11
+/dev/hdh12 <= Replacements/dev/hdh12
+/dev/hdh13 <= Replacements/dev/hdh13
+/dev/hdh14 <= Replacements/dev/hdh14
+/dev/hdh15 <= Replacements/dev/hdh15
+/dev/hdh16 <= Replacements/dev/hdh16
+/dev/hdh17 <= Replacements/dev/hdh17
+/dev/hdh18 <= Replacements/dev/hdh18
+/dev/hdh19 <= Replacements/dev/hdh19
+/dev/hdh2 <= Replacements/dev/hdh2
+/dev/hdh20 <= Replacements/dev/hdh20
+/dev/hdh3 <= Replacements/dev/hdh3
+/dev/hdh4 <= Replacements/dev/hdh4
+/dev/hdh5 <= Replacements/dev/hdh5
+/dev/hdh6 <= Replacements/dev/hdh6
+/dev/hdh7 <= Replacements/dev/hdh7
+/dev/hdh8 <= Replacements/dev/hdh8
+/dev/hdh9 <= Replacements/dev/hdh9
+/dev/scd0 <= Replacements/dev/scd0
+/dev/scd1 <= Replacements/dev/scd1
+/dev/scd10 <= Replacements/dev/scd10
+/dev/scd11 <= Replacements/dev/scd11
+/dev/scd12 <= Replacements/dev/scd12
+/dev/scd13 <= Replacements/dev/scd13
+/dev/scd14 <= Replacements/dev/scd14
+/dev/scd15 <= Replacements/dev/scd15
+/dev/scd16 <= Replacements/dev/scd16
+/dev/scd2 <= Replacements/dev/scd2
+/dev/scd3 <= Replacements/dev/scd3
+/dev/scd4 <= Replacements/dev/scd4
+/dev/scd5 <= Replacements/dev/scd5
+/dev/scd6 <= Replacements/dev/scd6
+/dev/scd7 <= Replacements/dev/scd7
+/dev/scd8 <= Replacements/dev/scd8
+/dev/scd9 <= Replacements/dev/scd9
diff --git a/sys-apps/yard/yard-2.0-r1.ebuild b/sys-apps/yard/yard-2.0-r1.ebuild
index e8e63cf5c0f5..31c653cbf81c 100644
--- a/sys-apps/yard/yard-2.0-r1.ebuild
+++ b/sys-apps/yard/yard-2.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.3 2001/04/09 05:28:18 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.4 2001/05/09 02:56:13 achim Exp $
 
-A=${P}.tar.gz
+A="${P}.tar.gz diet-utils.tar.bz2"
 S=${WORKDIR}/${P}
 DESCRIPTION="Yard is a suite of Perl scripts for creating rescue disks (also
 called bootdisks) for Linux."
-SRC_URI="http://www.croftj.net/~fawcett/yard/${A}"
+SRC_URI="http://www.croftj.net/~fawcett/yard/${P}.tar.gz"
 HOMEPAGE="http://www.croftj.net/~fawcett/yard/"
 
 src_unpack() {
@@ -20,6 +20,9 @@ src_unpack() {
     patch -p0 < ${FILESDIR}/${P}-extras-Makefile.in-gentoo.diff
 }
 
+src_unpack() {
+    unpack ${P}.tar.gz
+}
 src_compile() {
 
     cd ${S}
@@ -74,6 +77,12 @@ src_install () {
       MAKEDEV $i
     done
 
+    # diet-utils
+    cd ..
+    mkdir bin
+    cd bin
+    unpack diet-utils.tar.bz2
+
 
 
 }