Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/dracut/patches/dracut-024-busybox-compat.patch

    Contents of /trunk/dracut/patches/dracut-024-busybox-compat.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1947 - (show annotations) (download)
    Thu Nov 15 08:05:25 2012 UTC (11 years, 5 months ago) by niro
    File size: 4049 byte(s) 
    -rediffed against dracut-024
    1 diff -Naur dracut-024/dracut-functions.sh dracut-024-busybox/dracut-functions.sh
    2 --- dracut-024/dracut-functions.sh 2012-10-16 16:31:06.000000000 +0200
    3 +++ dracut-024-busybox/dracut-functions.sh 2012-11-15 13:04:59.440380838 +0100
    4 @@ -611,7 +611,7 @@
    5 else
    6 # create directory
    7 mkdir -m 0755 -p "${initdir}/$_file" || return 1
    8 - [[ -e "$_file" ]] && chmod --reference="$_file" "${initdir}/$_file"
    9 + [[ -e "$_file" ]] && chmod $(stat -c %a "$_file") "${initdir}/$_file"
    10 chmod u+w "${initdir}/$_file"
    11 fi
    12 done
    13 @@ -646,7 +646,7 @@
    14 fi
    15 fi
    16 ddebug "Installing $_src"
    17 - cp --reflink=auto --sparse=auto -pfL "$_src" "${initdir}/$_target"
    18 + cp -pfL "$_src" "${initdir}/$_target"
    19 }
    20
    21 # same as above, but specialized for symlinks
    22 diff -Naur dracut-024/dracut.sh dracut-024-busybox/dracut.sh
    23 --- dracut-024/dracut.sh 2012-10-16 16:31:06.000000000 +0200
    24 +++ dracut-024-busybox/dracut.sh 2012-11-15 13:05:29.033380711 +0100
    25 @@ -972,11 +972,11 @@
    26 if [[ -d "$i" ]]; then
    27 if ! [[ -e "$s" ]]; then
    28 mkdir -m 0755 -p "$s"
    29 - chmod --reference="$i" "$s"
    30 + chmod $(stat -c %a "$i") "$s"
    31 fi
    32 - cp --reflink=auto --sparse=auto -fa -t "$s" "$i"/*
    33 + cp -fa -t "$s" "$i"/*
    34 else
    35 - cp --reflink=auto --sparse=auto -fa -t "$s" "$i"
    36 + cp -fa -t "$s" "$i"
    37 fi
    38 done
    39 fi
    40 diff -Naur dracut-024/install/dracut-install.c dracut-024-busybox/install/dracut-install.c
    41 --- dracut-024/install/dracut-install.c 2012-10-16 16:31:06.000000000 +0200
    42 +++ dracut-024-busybox/install/dracut-install.c 2012-11-15 13:02:41.861381826 +0100
    43 @@ -230,7 +230,7 @@
    44 normal_copy:
    45 pid = fork();
    46 if (pid == 0) {
    47 - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode", "-fL", src, dst, NULL);
    48 + execlp("cp", "cp", "-pfL", src, dst, NULL);
    49 _exit(EXIT_FAILURE);
    50 }
    51
    52 diff -Naur dracut-024/modules.d/10i18n/module-setup.sh dracut-024-busybox/modules.d/10i18n/module-setup.sh
    53 --- dracut-024/modules.d/10i18n/module-setup.sh 2012-10-16 16:31:06.000000000 +0200
    54 +++ dracut-024-busybox/modules.d/10i18n/module-setup.sh 2012-11-15 13:02:22.020382022 +0100
    55 @@ -96,7 +96,7 @@
    56
    57 for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do
    58 inst_dir "$_src"
    59 - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_src}" "$_src"/*
    60 + cp -prfL -t "${initdir}/${_src}" "$_src"/*
    61 done
    62
    63 # remove unnecessary files
    64 diff -Naur dracut-024/modules.d/95terminfo/module-setup.sh dracut-024-busybox/modules.d/95terminfo/module-setup.sh
    65 --- dracut-024/modules.d/95terminfo/module-setup.sh 2012-10-16 16:31:06.000000000 +0200
    66 +++ dracut-024-busybox/modules.d/95terminfo/module-setup.sh 2012-11-15 13:03:00.573381726 +0100
    67 @@ -11,6 +11,6 @@
    68
    69 if [ -d ${_terminfodir} ]; then
    70 inst_dir "$_terminfodir"
    71 - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}" "$_terminfodir"/*
    72 + cp -prfL -t "${initdir}/${_terminfodir}" "$_terminfodir"/*
    73 fi
    74 }
    75 diff -Naur dracut-024/test/TEST-12-RAID-DEG/test.sh dracut-024-busybox/test/TEST-12-RAID-DEG/test.sh
    76 --- dracut-024/test/TEST-12-RAID-DEG/test.sh 2012-10-16 16:31:06.000000000 +0200
    77 +++ dracut-024-busybox/test/TEST-12-RAID-DEG/test.sh 2012-11-15 13:03:30.366381546 +0100
    78 @@ -9,8 +9,8 @@
    79
    80 client_run() {
    81 echo "CLIENT TEST START: $@"
    82 - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new
    83 - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new
    84 + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new
    85 + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new
    86
    87 $testdir/run-qemu \
    88 -hda $TESTDIR/root.ext2 -m 256M -nographic \