Magellan Linux

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

    Annotation of /trunk/dracut/patches/dracut-031-busybox.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2248 - (hide annotations) (download)
    Fri Aug 9 11:01:19 2013 UTC (10 years, 9 months ago) by niro
    File size: 13172 byte(s) 
    -rediffed an consolidated all busybox patches
    1 niro 2248 diff -Naur dracut-031/51-dracut-rescue.install dracut-031-busybox/51-dracut-rescue.install
    2     --- dracut-031/51-dracut-rescue.install 2013-07-31 12:24:25.000000000 +0000
    3     +++ dracut-031-busybox/51-dracut-rescue.install 2013-08-09 13:20:53.541000000 +0000
    4     @@ -17,7 +17,7 @@
    5     [[ -f $i ]] && echo ${i##*/}
    6     done
    7     shift
    8     - done | sort -Vu
    9     + done | sort -u
    10     )
    11    
    12     for f in $files; do
    13     diff -Naur dracut-031/51-dracut-rescue-postinst.sh dracut-031-busybox/51-dracut-rescue-postinst.sh
    14     --- dracut-031/51-dracut-rescue-postinst.sh 2013-07-31 12:24:25.000000000 +0000
    15     +++ dracut-031-busybox/51-dracut-rescue-postinst.sh 2013-08-09 13:21:04.310000000 +0000
    16     @@ -33,7 +33,7 @@
    17     [[ -f $i ]] && echo ${i##*/}
    18     done
    19     shift
    20     - done | sort -Vu
    21     + done | sort -u
    22     )
    23    
    24     for f in $files; do
    25     diff -Naur dracut-031/dracut-functions.sh dracut-031-busybox/dracut-functions.sh
    26     --- dracut-031/dracut-functions.sh 2013-07-31 12:24:25.000000000 +0000
    27     +++ dracut-031-busybox/dracut-functions.sh 2013-08-09 13:14:51.703000000 +0000
    28     @@ -236,7 +236,7 @@
    29     echo "$__newpath"
    30     }
    31    
    32     -if [[ "$(ln --help)" == *--relative* ]]; then
    33     +if [[ "$(ln --help &>/dev/null)" == *--relative* ]]; then
    34     ln_r() {
    35     ln -sfnr "${initdir}/$1" "${initdir}/$2"
    36     }
    37     @@ -664,7 +664,7 @@
    38     else
    39     # create directory
    40     mkdir -m 0755 -p "${initdir}/$_file" || return 1
    41     - [[ -e "$_file" ]] && chmod --reference="$_file" "${initdir}/$_file"
    42     + [[ -e "$_file" ]] && chmod $(stat -c %a "$_file") "${initdir}/$_file"
    43     chmod u+w "${initdir}/$_file"
    44     fi
    45     done
    46     @@ -699,7 +699,7 @@
    47     fi
    48     fi
    49     ddebug "Installing $_src"
    50     - cp --reflink=auto --sparse=auto -pfL "$_src" "${initdir}/$_target"
    51     + cp -pfL "$_src" "${initdir}/$_target"
    52     }
    53    
    54     # same as above, but specialized for symlinks
    55     diff -Naur dracut-031/dracut.sh dracut-031-busybox/dracut.sh
    56     --- dracut-031/dracut.sh 2013-08-09 13:12:14.717000000 +0000
    57     +++ dracut-031-busybox/dracut.sh 2013-08-09 13:26:46.131000000 +0000
    58     @@ -252,7 +252,7 @@
    59     printf "%s\n" "${i##*/}"
    60     fi
    61     done
    62     - done | sort -Vu | {
    63     + done | sort -u | {
    64     readarray -t files
    65    
    66     for f in "${files[@]}"; do
    67     @@ -1153,11 +1153,11 @@
    68     if [[ -d "$i" ]]; then
    69     if ! [[ -e "$s" ]]; then
    70     mkdir -m 0755 -p "$s"
    71     - chmod --reference="$i" "$s"
    72     + chmod $(stat -c %a "$i") "$s"
    73     fi
    74     - cp --reflink=auto --sparse=auto -fa -t "$s" "$i"/*
    75     + cp -fa "$i"/* "$s"
    76     else
    77     - cp --reflink=auto --sparse=auto -fa -t "$s" "$i"
    78     + cp -fa "$i" "$s"
    79     fi
    80     done
    81     fi
    82     diff -Naur dracut-031/install/dracut-install.c dracut-031-busybox/install/dracut-install.c
    83     --- dracut-031/install/dracut-install.c 2013-07-31 12:24:25.000000000 +0000
    84     +++ dracut-031-busybox/install/dracut-install.c 2013-08-09 13:19:45.964000000 +0000
    85     @@ -239,14 +239,14 @@
    86     normal_copy:
    87     pid = fork();
    88     if (pid == 0) {
    89     - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, NULL);
    90     + execlp("cp", "cp", "-pfL", src, dst, NULL);
    91     _exit(EXIT_FAILURE);
    92     }
    93    
    94     while (waitpid(pid, &ret, 0) < 0) {
    95     if (errno != EINTR) {
    96     ret = -1;
    97     - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, dst);
    98     + log_error("Failed: cp -pfL %s %s", src, dst);
    99     break;
    100     }
    101     }
    102     diff -Naur dracut-031/modules.d/10i18n/module-setup.sh dracut-031-busybox/modules.d/10i18n/module-setup.sh
    103     --- dracut-031/modules.d/10i18n/module-setup.sh 2013-07-31 12:24:25.000000000 +0000
    104     +++ dracut-031-busybox/modules.d/10i18n/module-setup.sh 2013-08-09 13:22:36.177000000 +0000
    105     @@ -107,7 +107,7 @@
    106    
    107     for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do
    108     inst_dir "$_src"
    109     - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_src}" "$_src"/*
    110     + cp -prfL "$_src"/* "${initdir}/${_src}"
    111     done
    112    
    113     # remove unnecessary files
    114     diff -Naur dracut-031/modules.d/95terminfo/module-setup.sh dracut-031-busybox/modules.d/95terminfo/module-setup.sh
    115     --- dracut-031/modules.d/95terminfo/module-setup.sh 2013-07-31 12:24:25.000000000 +0000
    116     +++ dracut-031-busybox/modules.d/95terminfo/module-setup.sh 2013-08-09 13:27:47.421000000 +0000
    117     @@ -12,7 +12,7 @@
    118     if [ -d ${_terminfodir} ]; then
    119     for i in "l/linux" "v/vt100" "v/vt220"; do
    120     inst_dir "$_terminfodir/${i%/*}"
    121     - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
    122     + cp -prfL "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}"
    123     done
    124     fi
    125     }
    126     diff -Naur dracut-031/modules.d/99base/dracut-lib.sh dracut-031-busybox/modules.d/99base/dracut-lib.sh
    127     --- dracut-031/modules.d/99base/dracut-lib.sh 2013-07-31 12:24:25.000000000 +0000
    128     +++ dracut-031-busybox/modules.d/99base/dracut-lib.sh 2013-08-09 13:28:43.527000000 +0000
    129     @@ -641,7 +641,7 @@
    130     copytree() {
    131     local src="$1" dest="$2"
    132     mkdir -p "$dest"; dest=$(readlink -e -q "$dest")
    133     - ( cd "$src"; cp -af . -t "$dest" )
    134     + ( cd "$src"; cp -af . "$dest" )
    135     }
    136    
    137     # Evaluates command for UUIDs either given as arguments for this function or all
    138     diff -Naur dracut-031/test/old.TEST-14-IMSM/create-root.sh dracut-031-busybox/test/old.TEST-14-IMSM/create-root.sh
    139     --- dracut-031/test/old.TEST-14-IMSM/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    140     +++ dracut-031-busybox/test/old.TEST-14-IMSM/create-root.sh 2013-08-09 13:35:29.591000000 +0000
    141     @@ -59,7 +59,7 @@
    142     mke2fs -L root /dev/dracut/root && \
    143     mkdir -p /sysroot && \
    144     mount /dev/dracut/root /sysroot && \
    145     -cp -a -t /sysroot /source/* && \
    146     +cp -a /source/* /sysroot && \
    147     umount /sysroot && \
    148     lvm lvchange -a n /dev/dracut/root && \
    149     echo "dracut-root-block-created" >/dev/sda
    150     diff -Naur dracut-031/test/TEST-01-BASIC/create-root.sh dracut-031-busybox/test/TEST-01-BASIC/create-root.sh
    151     --- dracut-031/test/TEST-01-BASIC/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    152     +++ dracut-031-busybox/test/TEST-01-BASIC/create-root.sh 2013-08-09 13:30:11.384000000 +0000
    153     @@ -15,7 +15,7 @@
    154     mkfs.ext3 -L dracut /dev/sda2
    155     mkdir -p /root
    156     mount /dev/sda2 /root
    157     -cp -a -t /root /source/*
    158     +cp -a /source/* /root
    159     mkdir -p /root/run
    160     umount /root
    161     echo "dracut-root-block-created" >/dev/sda1
    162     diff -Naur dracut-031/test/TEST-02-SYSTEMD/create-root.sh dracut-031-busybox/test/TEST-02-SYSTEMD/create-root.sh
    163     --- dracut-031/test/TEST-02-SYSTEMD/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    164     +++ dracut-031-busybox/test/TEST-02-SYSTEMD/create-root.sh 2013-08-09 13:37:11.489000000 +0000
    165     @@ -15,7 +15,7 @@
    166     mkfs.ext3 -L dracut /dev/sda2
    167     mkdir -p /root
    168     mount /dev/sda2 /root
    169     -cp -a -t /root /source/*
    170     +cp -a /source/* /root
    171     mkdir -p /root/run
    172     umount /root
    173     echo "dracut-root-block-created" >/dev/sda1
    174     diff -Naur dracut-031/test/TEST-03-USR-MOUNT/create-root.sh dracut-031-busybox/test/TEST-03-USR-MOUNT/create-root.sh
    175     --- dracut-031/test/TEST-03-USR-MOUNT/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    176     +++ dracut-031-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2013-08-09 13:34:19.270000000 +0000
    177     @@ -29,7 +29,7 @@
    178     btrfs subvolume create /root/usr/usr
    179     umount /root/usr
    180     mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr
    181     -cp -a -t /root /source/*
    182     +cp -a /source/* /root
    183     mkdir -p /root/run
    184     umount /root/usr
    185     umount /root
    186     diff -Naur dracut-031/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-031-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh
    187     --- dracut-031/test/TEST-04-FULL-SYSTEMD/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    188     +++ dracut-031-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2013-08-09 13:34:41.910000000 +0000
    189     @@ -29,7 +29,7 @@
    190     btrfs subvolume create /root/usr/usr
    191     umount /root/usr
    192     mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr
    193     -cp -a -t /root /source/*
    194     +cp -a /source/* /root
    195     mkdir -p /root/run
    196     umount /root/usr
    197     umount /root
    198     diff -Naur dracut-031/test/TEST-10-RAID/create-root.sh dracut-031-busybox/test/TEST-10-RAID/create-root.sh
    199     --- dracut-031/test/TEST-10-RAID/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    200     +++ dracut-031-busybox/test/TEST-10-RAID/create-root.sh 2013-08-09 13:36:23.847000000 +0000
    201     @@ -28,7 +28,7 @@
    202     mke2fs /dev/dracut/root
    203     mkdir -p /sysroot
    204     mount /dev/dracut/root /sysroot
    205     -cp -a -t /sysroot /source/*
    206     +cp -a /source/* /sysroot
    207     umount /sysroot
    208     lvm lvchange -a n /dev/dracut/root
    209     udevadm settle
    210     diff -Naur dracut-031/test/TEST-11-LVM/create-root.sh dracut-031-busybox/test/TEST-11-LVM/create-root.sh
    211     --- dracut-031/test/TEST-11-LVM/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    212     +++ dracut-031-busybox/test/TEST-11-LVM/create-root.sh 2013-08-09 13:36:49.073000000 +0000
    213     @@ -21,7 +21,7 @@
    214     mke2fs /dev/dracut/root && \
    215     mkdir -p /sysroot && \
    216     mount /dev/dracut/root /sysroot && \
    217     -cp -a -t /sysroot /source/* && \
    218     +cp -a /source/* /sysroot && \
    219     umount /sysroot && \
    220     sleep 1 && \
    221     lvm lvchange -a n /dev/dracut/root && \
    222     diff -Naur dracut-031/test/TEST-12-RAID-DEG/create-root.sh dracut-031-busybox/test/TEST-12-RAID-DEG/create-root.sh
    223     --- dracut-031/test/TEST-12-RAID-DEG/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    224     +++ dracut-031-busybox/test/TEST-12-RAID-DEG/create-root.sh 2013-08-09 13:35:05.421000000 +0000
    225     @@ -31,7 +31,7 @@
    226     mke2fs -L root /dev/dracut/root
    227     mkdir -p /sysroot
    228     mount /dev/dracut/root /sysroot
    229     -cp -a -t /sysroot /source/*
    230     +cp -a /source/* /sysroot
    231     mkdir /sysroot/run
    232     umount /sysroot
    233     lvm lvchange -a n /dev/dracut/root
    234     diff -Naur dracut-031/test/TEST-12-RAID-DEG/test.sh dracut-031-busybox/test/TEST-12-RAID-DEG/test.sh
    235     --- dracut-031/test/TEST-12-RAID-DEG/test.sh 2013-07-31 12:24:25.000000000 +0000
    236     +++ dracut-031-busybox/test/TEST-12-RAID-DEG/test.sh 2013-08-09 13:19:12.699000000 +0000
    237     @@ -11,8 +11,8 @@
    238    
    239     client_run() {
    240     echo "CLIENT TEST START: $@"
    241     - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new
    242     - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new
    243     + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new
    244     + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new
    245    
    246     $testdir/run-qemu \
    247     -hda $TESTDIR/root.ext2 -m 256M -nographic -smp 2 \
    248     diff -Naur dracut-031/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-031-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh
    249     --- dracut-031/test/TEST-13-ENC-RAID-LVM/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    250     +++ dracut-031-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2013-08-09 13:36:00.607000000 +0000
    251     @@ -31,7 +31,7 @@
    252     mke2fs /dev/dracut/root && \
    253     mkdir -p /sysroot && \
    254     mount /dev/dracut/root /sysroot && \
    255     -cp -a -t /sysroot /source/* && \
    256     +cp -a /source/* /sysroot && \
    257     umount /sysroot && \
    258     sleep 2 && \
    259     lvm lvchange -a n /dev/dracut/root && \
    260     diff -Naur dracut-031/test/TEST-15-BTRFSRAID/create-root.sh dracut-031-busybox/test/TEST-15-BTRFSRAID/create-root.sh
    261     --- dracut-031/test/TEST-15-BTRFSRAID/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    262     +++ dracut-031-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2013-08-09 13:29:42.176000000 +0000
    263     @@ -22,7 +22,7 @@
    264     set -e
    265     mkdir -p /sysroot
    266     mount -t btrfs /dev/sda8 /sysroot
    267     -cp -a -t /sysroot /source/*
    268     +cp -a /source/* /sysroot
    269     umount /sysroot
    270     echo "dracut-root-block-created" >/dev/sda1
    271     poweroff -f
    272     diff -Naur dracut-031/test/TEST-30-ISCSI/create-root.sh dracut-031-busybox/test/TEST-30-ISCSI/create-root.sh
    273     --- dracut-031/test/TEST-30-ISCSI/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    274     +++ dracut-031-busybox/test/TEST-30-ISCSI/create-root.sh 2013-08-09 13:33:06.619000000 +0000
    275     @@ -8,7 +8,7 @@
    276     mkfs.ext3 -j -F /dev/sda && \
    277     mkdir -p /sysroot && \
    278     mount /dev/sda /sysroot && \
    279     -cp -a -t /sysroot /source/* && \
    280     +cp -a /source/* /sysroot && \
    281     umount /sysroot && \
    282     mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \
    283     mdadm -W /dev/md0 || : && \
    284     @@ -18,7 +18,7 @@
    285     lvm vgchange -ay && \
    286     mkfs.ext3 -j -L sysroot /dev/dracut/root && \
    287     mount /dev/dracut/root /sysroot && \
    288     -cp -a -t /sysroot /source/* && \
    289     +cp -a /source/* /sysroot && \
    290     umount /sysroot && \
    291     lvm lvchange -a n /dev/dracut/root && \
    292     echo "dracut-root-block-created" >/dev/sdb
    293     diff -Naur dracut-031/test/TEST-40-NBD/create-root.sh dracut-031-busybox/test/TEST-40-NBD/create-root.sh
    294     --- dracut-031/test/TEST-40-NBD/create-root.sh 2013-07-31 12:24:25.000000000 +0000
    295     +++ dracut-031-busybox/test/TEST-40-NBD/create-root.sh 2013-08-09 13:29:16.535000000 +0000
    296     @@ -17,7 +17,7 @@
    297     /sbin/tune2fs -e continue /dev/dracut/root && \
    298     mkdir -p /sysroot && \
    299     mount /dev/dracut/root /sysroot && \
    300     -cp -a -t /sysroot /source/* && \
    301     +cp -a /source/* /sysroot && \
    302     umount /sysroot
    303     sleep 1
    304     lvm lvchange -a n /dev/dracut/root