summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2001-11-12 15:13:52 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2001-11-12 15:13:52 +0000
commit7fb1805de7a04931c1302c3b93175f4b8d6ceaf3 (patch)
treef1e179932d833591cb86dfdba2d2fbd7847967ca
parentdf04cb9d3a11b6611747d0d62871e14df689ae17 (diff)
downloaddrakx-7fb1805de7a04931c1302c3b93175f4b8d6ceaf3.tar
drakx-7fb1805de7a04931c1302c3b93175f4b8d6ceaf3.tar.gz
drakx-7fb1805de7a04931c1302c3b93175f4b8d6ceaf3.tar.bz2
drakx-7fb1805de7a04931c1302c3b93175f4b8d6ceaf3.tar.xz
drakx-7fb1805de7a04931c1302c3b93175f4b8d6ceaf3.zip
- Add bash as the default shell on ia64
- Add fibootmgr and xfs_repair - Remove wacom module for X11 on ia64
-rw-r--r--perl-install/Makefile4
-rw-r--r--perl-install/share/list1
-rw-r--r--perl-install/share/list.ia644
3 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 51acbc583..1f11be062 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -134,7 +134,11 @@ endif
ifeq (i386,$(ARCH))
cp ../tools/i386/busybox $(DEST)/usr/bin
endif
+ifeq (ia64,$(ARCH))
+ ln -sf bash $(DEST)/usr/bin/sh
+else
ln -sf ash $(DEST)/usr/bin/sh
+endif
for i in fonts keyboards locales keymaps; do tar xfj `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done
diff --git a/perl-install/share/list b/perl-install/share/list
index 5088abc34..230c8f030 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -18,7 +18,6 @@
/sbin/resize2fs
/sbin/dumpe2fs
/sbin/modinfo
-/usr/X11R6/lib/modules/xf86Wacom.so
/usr/bin/bzip2
/usr/bin/packdrake
/usr/bin/parsehdlist
diff --git a/perl-install/share/list.ia64 b/perl-install/share/list.ia64
index 9bbf999cb..5a620e0c6 100644
--- a/perl-install/share/list.ia64
+++ b/perl-install/share/list.ia64
@@ -5,6 +5,10 @@
/sbin/mkdosfs
/sbin/resize_reiserfs
/usr/bin/strace
+/bin/bash
+/bin/vim-minimal
+/usr/sbin/parted
+/usr/sbin/efibootmgr
/var/log/XFree86.0.log
/usr/X11R6/bin/XFree86
/usr/X11R6/bin/xmodmap