summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-08 18:22:55 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-08 18:22:55 +0000
commit33c692443426a830e6ac1bc02279246907352704 (patch)
treeba4bb9ae2ac0c19c37d1f479a4d4eae0bbed978b
parent1a2b7368e1192f501fa5a10f989df26d7575a559 (diff)
downloaddrakx-33c692443426a830e6ac1bc02279246907352704.tar
drakx-33c692443426a830e6ac1bc02279246907352704.tar.gz
drakx-33c692443426a830e6ac1bc02279246907352704.tar.bz2
drakx-33c692443426a830e6ac1bc02279246907352704.tar.xz
drakx-33c692443426a830e6ac1bc02279246907352704.zip
add gdb-inst, a wrapper for running GDB in installer a simpler way
split share/runinstall2.sh out of Makefile & make it more usefull
-rw-r--r--perl-install/install/Makefile3
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/share/gdb-inst2
-rw-r--r--perl-install/install/share/runinstall2.sh7
4 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index 9d4f35246..405cd9904 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -104,8 +104,7 @@ stage2:
dont_run_directly_stage2:
[ -d $(DEST) ] || ../../tools/mdkinst_stage2_tool --uncompress $(STAGE2_DEST)
- echo -e '#!/bin/sh\n\nperl -I/usr/lib/libDrakX -Minstall::install2 -e "install::install2::start_udev()"\nexec /usr/bin/busybox sh' > $(DEST)/usr/bin/runinstall2.sh
- chmod a+x $(DEST)/usr/bin/runinstall2.sh
+ install -m 755 share/runinstall2.sh share/gdb-inst $(DEST)/usr/bin/
ln -sf runinstall2.sh $(DEST)/usr/bin/runinstall2
trace_stage2:
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a8863c182..82bc16e7b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- add a wrapper for running GDB in installer a simpler way
+
Version 13.91 - 08 March 2012
- Mageia 2 beta 2 banner
diff --git a/perl-install/install/share/gdb-inst b/perl-install/install/share/gdb-inst
new file mode 100644
index 000000000..84c2db9bf
--- /dev/null
+++ b/perl-install/install/share/gdb-inst
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec gdb -q --args perl /usr/bin/install2 \ No newline at end of file
diff --git a/perl-install/install/share/runinstall2.sh b/perl-install/install/share/runinstall2.sh
new file mode 100644
index 000000000..10f3ef700
--- /dev/null
+++ b/perl-install/install/share/runinstall2.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "Starting Udev\n"
+perl -I/usr/lib/libDrakX -Minstall::install2 -e "install::install2::start_udev()"
+echo "You can start the installer by running install2"
+echo "You can run it in GDB by running gdb-inst"
+exec /usr/bin/busybox sh