Browse Source

init: adjust to the new location of functions.in

stable/0.6
Alejandro Mery 10 years ago
parent
commit
60f217e6bf
3 changed files with 10 additions and 9 deletions
  1. +4
    -3
      target/early/build-initramfs.in
  2. +2
    -2
      target/early/initramfs/init.sh
  3. +4
    -4
      target/early/initramfs/sbin_init.d_functions-ansi.in.patch

+ 4
- 3
target/early/build-initramfs.in

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: target/early/build-initramfs.in
# Copyright (C) 2007 - 2010 The OpenSDE Project
# Copyright (C) 2007 - 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -32,7 +32,7 @@ initramfs_install() {
cp "$root/usr/bin/strace" "$initrddir/bin/"
;;
sysfiles)
for x in etc/{,SDE-}VERSION etc/{passwd,group} etc/rc.d/functions{,-ansi}.in; do
for x in etc/{,SDE-}VERSION etc/{passwd,group} etc/init.d/functions{,-ansi}.in; do
cp "$root/$x" "$initrddir/$x"
done
for x in etc/{fstab,hosts,resolv.conf}; do
@ -50,12 +50,13 @@ initramfs_install() {
early_adjust_initrd() {
echo_status "Tweaking initrd ..."
for x in var/spool/{locks,mail} \
usr/{doc,info,man,opt,spool} etc/{rc.d/,}init.d usr
usr/{doc,info,man,opt,spool} etc/init.d usr
do
rm ${rootfs}/$x
done
mkdir "${rootfs}/rootfs"
set +x
}

+ 2
- 2
target/early/initramfs/init.sh

@ -3,7 +3,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: target/early/initramfs/init.sh
# Copyright (C) 2007 - 2011 The OpenSDE Project
# Copyright (C) 2007 - 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -52,7 +52,7 @@ for x; do
esac
done
. /etc/rc.d/functions.in
. /etc/init.d/functions.in
banner "Starting Early User Space environment"

target/early/initramfs/etc_rc.d_functions-ansi.in.patch → target/early/initramfs/sbin_init.d_functions-ansi.in.patch

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: target/early/initramfs/etc_rc.d_functions-ansi.in.patch
# Copyright (C) 2008 The OpenSDE Project
# Filename: target/early/initramfs/etc_init.d_functions-ansi.in.patch
# Copyright (C) 2008 - 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,8 +14,8 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./etc/rc.d/functions-ansi.in.orig 2008-02-15 13:43:05.000000000 +0000
+++ ./etc/rc.d/functions-ansi.in 2008-02-15 13:44:12.000000000 +0000
--- ./sbin/init.d/functions-ansi.in.orig 2008-02-15 13:43:05.000000000 +0000
+++ ./sbin/init.d/functions-ansi.in 2008-02-15 13:44:12.000000000 +0000
@@ -16,8 +16,8 @@
#

Loading…
Cancel
Save