Changeset 811f42a


Ignore:
Timestamp:
05/02/2021 08:23:32 AM (6 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/usr-move
Children:
b7dc3d8
Parents:
a68ea9a (diff), 54ee51d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into xry111/usr-move

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • chapter07/createfiles.xml

    ra68ea9a r811f42a  
    4848  as well:</para>
    4949
    50 <screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
     50<screen><userinput>cat &gt; /etc/hosts &lt;&lt; EOF
     51"127.0.0.1 localhost $(hostname)"
     52::1        localhost
     53EOF</userinput></screen>
    5154
    5255  <para>In order for user <systemitem class="username">root</systemitem> to be
  • git-version.sh

    ra68ea9a r811f42a  
    1515
    1616commit_date=$(git show -s --format=format:"%cd" --date=local)
    17 short_date=$(date --date "$commit_date" "+%Y%m%d")
    1817
    1918year=$(date --date "$commit_date" "+%Y")
     
    3130full_date="$month $day$suffix, $year"
    3231
    33 sha="g$(git describe --always)"
    34 version="GIT-$short_date-$sha"
    35 versiond="GIT-$short_date-$sha-systemd"
     32sha="$(git describe --abbrev=1)"
     33if [ "$(git branch --show-current)" = "trunk" ]; then
     34        sha=$(echo "$sha" | sed 's/-g[^-]*$//')
     35fi
     36version="$sha"
     37versiond="$sha-systemd"
    3638
    3739if [ "$(git diff HEAD | wc -l)" != "0" ]; then
    38         version="$version-MODIFIED"
    39         versiond="$versiond-MODIFIED"
     40        version="$version+"
     41        versiond="$versiond+"
    4042fi
    4143
Note: See TracChangeset for help on using the changeset viewer.