diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-05 04:09:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-05 04:09:57 +0000 |
| commit | b1d9fec7b7ecdce88ff72cab3bc349f6aa341539 (patch) | |
| tree | 71347ef3e292956d0f025b32f9f72b024826b418 | |
| parent | e95c7e15a388c5cef80305dec1a9ed2cbe367c7d (diff) | |
| download | drakx-b1d9fec7b7ecdce88ff72cab3bc349f6aa341539.tar drakx-b1d9fec7b7ecdce88ff72cab3bc349f6aa341539.tar.gz drakx-b1d9fec7b7ecdce88ff72cab3bc349f6aa341539.tar.bz2 drakx-b1d9fec7b7ecdce88ff72cab3bc349f6aa341539.tar.xz drakx-b1d9fec7b7ecdce88ff72cab3bc349f6aa341539.zip | |
update (Christiaan Welvaart)
| -rw-r--r-- | perl-install/share/list.ppc | 6 | ||||
| -rw-r--r-- | rescue/list.ppc | 5 | ||||
| -rwxr-xr-x | tools/ppc/mkINSTALLCD | 19 |
3 files changed, 12 insertions, 18 deletions
diff --git a/perl-install/share/list.ppc b/perl-install/share/list.ppc index 6af948e24..d940c90f2 100644 --- a/perl-install/share/list.ppc +++ b/perl-install/share/list.ppc @@ -8,12 +8,11 @@ /usr/bin/hcopy /usr/bin/hcd /sbin/pdisk -/usr/X11R6/bin/Xpmac -/usr/X11R6/bin/XFree86 +/usr/X11R6/bin/Xorg /usr/X11R6/bin/xmodmap /sbin/mkfs.xfs /sbin/mkfs.jfs -/usr/X11R6/lib/modules/xf86Wacom.so +/usr/X11R6/lib/modules/input/wacom_drv.o /usr/X11R6/lib/modules/libpcidata.a /usr/X11R6/lib/modules/fonts/libbitmap.a /usr/X11R6/lib/modules/libscanpci.a @@ -33,4 +32,3 @@ /usr/X11R6/lib/modules/libint10.a /usr/X11R6/lib/modules/libvbe.a /usr/X11R6/lib/modules/libvgahw.a -/etc/X11/xinit.d/PPC_altgr_compose diff --git a/rescue/list.ppc b/rescue/list.ppc index d81d4a268..4c1616128 100644 --- a/rescue/list.ppc +++ b/rescue/list.ppc @@ -1,3 +1,8 @@ +/sbin/resize2fs +/sbin/resize_reiserfs +/sbin/mkreiserfs +/sbin/reiserfsck +/sbin/xfs_repair /usr/lib/perl5/PERL_VERSION/ppc-linux-thread-multi/CORE/libperl.so /sbin/pdisk /usr/sbin/ybin diff --git a/tools/ppc/mkINSTALLCD b/tools/ppc/mkINSTALLCD index 2f81fa5e9..d7686f01d 100755 --- a/tools/ppc/mkINSTALLCD +++ b/tools/ppc/mkINSTALLCD @@ -21,18 +21,7 @@ fi # select the appropriate mkhybrid binary depending on if # we are on x86 or ppc -ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'` - -if [ "$ARCH" == "ppc" ]; then - MKHYBRID=mkhybrid-1.12b5.4 -else - if [ "$ARCH" == "i386" ]; then - MKHYBRID=mkhybrid-1.12b5.4-x86 - else - echo "Sorry, no mkhybrid binary for $ARCH..." - exit - fi -fi +MKHYBRID=mkisofs #Change these when you build the CD.. ApplicationID="Linux-Mandrake" @@ -43,7 +32,7 @@ volid=ppc hfsVolid=Linux-Mandrake curPwd=`pwd` -$curPwd/$MKHYBRID -part -hfs -r -l -J \ +$MKHYBRID -part -hfs -r -l -J \ -A $ApplicationID \ -P $PublisherID \ -p $PreparerID \ @@ -60,6 +49,8 @@ $curPwd/$MKHYBRID -part -hfs -r -l -J \ -hide '*.MacOS' -hide '*.DOS' \ -hide-joliet '*.Unix' -hide-joliet '*.MacOS' \ -hide-hfs '*.Unix' -hide-hfs '*.DOS' \ +-hfs-bless $1/boot \ +-hfs-unlock \ -pad \ -o $2 \ $1 @@ -71,7 +62,7 @@ hcd boot hattrib -t tbxi -c UNIX ofboot.b hattrib -t boot -c UNIX yaboot hattrib -t boot -c UNIX vmlinux -hattrib -t boot -c UNIX vmlinux-2.2 +hattrib -t boot -c UNIX vmlinux-2.4 hattrib -t conf -c UNIX yaboot.conf hcd hcd BootX |