Sfoglia il codice sorgente

Removed downloading and verification of stage3-*.CONTENTS

stage3 is verified using digest signatures anyway, so adapting
encoding every time Gentoo changes it makes no sense (GitHub: #9).
Maxim Kammerer 12 anni fa
parent
commit
6be1973a89
1 ha cambiato i file con 2 aggiunte e 13 eliminazioni
  1. 2 13
      mkroot

+ 2 - 13
mkroot

@@ -66,7 +66,7 @@ fi
 
 sinfo "Downloading ${stage3file}"
 wget -c -nv -P ${LIVECD}/mirror/stage3 ${stage3base}/${stage3}.DIGESTS.asc \
-    ${stage3base}/${stage3}.CONTENTS ${stage3base}/${stage3}
+    ${stage3base}/${stage3}
 
 sinfo "Downloading portage-latest.tar.bz2"
 wget -N -nv -P ${LIVECD}/mirror/portage ${portage}.gpgsig ${portage}
@@ -135,18 +135,7 @@ sed '/^# WHIRLPOOL HASH$/{N; s/.*/\n/}' ${LIVECD}/mirror/stage3/${stage3file}.DI
     | (cd ${LIVECD}/mirror/stage3; sha512sum -c)
 
 
-if tar --version | grep -q '(GNU tar)'; then
-    sinfo "Verifying stage3 files list"
-    LC_ALL=en_US.UTF-8 tar --utc -tjvf ${LIVECD}/mirror/stage3/${stage3file} > ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS.actual
-    cmp -s ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS \
-           ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS.actual
-    rm     ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS.actual
-else
-    sinfo "*** No GNU tar, skipping stage3 files list verification"
-fi
-
-
-	sinfo "Removing ${LIVECD}/src"
+sinfo "Removing ${LIVECD}/src"
 rm -rf --one-file-system ${LIVECD}/src
 mkdir -m 755 ${LIVECD}/src