diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-04 17:12:35 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-04 17:12:35 +0100 |
| commit | 5e256ccc88d10f2085d726f9c230df3ea15091e0 (patch) | |
| tree | 3bb5adb173dad4bedb2a1c5a2193bbc7a06ba466 /pkgs/tools/misc/grub | |
| parent | c138356805fb23c029f7eadb8dab087d88230110 (diff) | |
| parent | 50e7ddbdcafbda47de85af336d2aa96da904d5c1 (diff) | |
| download | nixlib-5e256ccc88d10f2085d726f9c230df3ea15091e0.tar nixlib-5e256ccc88d10f2085d726f9c230df3ea15091e0.tar.gz nixlib-5e256ccc88d10f2085d726f9c230df3ea15091e0.tar.bz2 nixlib-5e256ccc88d10f2085d726f9c230df3ea15091e0.tar.lz nixlib-5e256ccc88d10f2085d726f9c230df3ea15091e0.tar.xz nixlib-5e256ccc88d10f2085d726f9c230df3ea15091e0.tar.zst nixlib-5e256ccc88d10f2085d726f9c230df3ea15091e0.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/tools/misc/grub')
| -rw-r--r-- | pkgs/tools/misc/grub/device-mapper-symlinks.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/pkgs/tools/misc/grub/device-mapper-symlinks.patch b/pkgs/tools/misc/grub/device-mapper-symlinks.patch deleted file mode 100644 index 0a21a51de799..000000000000 --- a/pkgs/tools/misc/grub/device-mapper-symlinks.patch +++ /dev/null @@ -1,28 +0,0 @@ -Only in grub-1.97.1-orig/: grub-1.97.1 -diff -rc -x '*~' grub-1.97.1-orig/util/getroot.c grub-1.97.1/util/getroot.c -*** grub-1.97.1-orig/util/getroot.c 2009-11-09 16:48:16.000000000 +0100 ---- grub-1.97.1/util/getroot.c 2010-01-08 00:26:12.000000000 +0100 -*************** -*** 217,224 **** - continue; - - if (S_ISLNK (st.st_mode)) -! /* Don't follow symbolic links. */ -! continue; - - if (S_ISDIR (st.st_mode)) - { ---- 217,229 ---- - continue; - - if (S_ISLNK (st.st_mode)) -! { -! if (strcmp(dir, "mapper") != 0) -! /* Don't follow symbolic links. */ -! continue; -! if (stat (ent->d_name, &st) < 0) -! continue; -! } - - if (S_ISDIR (st.st_mode)) - { |