Skip to content

GitLab

C
create-iso
Commit df0f9afe authored by Lucas Sulzbach's avatar Lucas Sulzbach
Browse files
Options

Merge branch 'issue/611' into 'develop' 

SCRUM#611: Prevents conflicts during dist-upgrade

See merge request !18
parents 6df32bda 7375aa53
Pipeline #18778 passed with stage
    in 12 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 4 additions and 0 deletions
    scripts-available/setup.sh
    View file @ df0f9afe
    ......@@ -91,5 +91,9 @@ createIsoLogger --message "Unable to change pretty name in os-release file" --ty
    cp "${PREFIX}/src/lsb-release" "${CHROOTDIR}/etc/" || \
    createIsoLogger --message "Unable to copy lsb-release file to chroot" --type warning --tag "cp"
    echo "force-confdef" >> /etc/dpkg/dpkg.cfg || \
    createIsoLogger --message "Unable to append config option dpkg.cfg" --type warning --tag "echo"
    echo "force-confold" >> /etc/dpkg/dpkg.cfg || \
    createIsoLogger --message "Unable to append config option dpkg.cfg" --type warning --tag "echo"
    exit 0
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment