Commit 2a60e92c authored by Diego Giovane Pasqualin's avatar Diego Giovane Pasqualin
Browse files

Merge branch 'develop' into 'master'

Issue SCRUM#227

See merge request !5
parents 4af514de 0770bd18
Pipeline #12223 failed with stages
in 21 minutes and 48 seconds
......@@ -47,8 +47,7 @@ deploy:
only:
- master
tags:
- ubuntu
- regular
- debian-packaging
script:
- echo "Estágio de Deploy"
- apt-get update && apt-get install -y dput ssh
......
......@@ -132,7 +132,7 @@ EOF
mountpoints > /tmp/mount.post
update_mtab
cp /etc/default/version /target/etc/default
# Try to enable proxy when using HTTP.
# What about using ftp_proxy for FTP sources?
RET=$(debconf-get mirror/protocol || true)
......
......@@ -113,7 +113,11 @@ while :; do
if [ "$RET" = false ]; then
# always make non-root user; this user will be able
# to sudo to root
db_set passwd/make-user false
if [ $(cat /etc/default/version) == "Escola" ]; then
db_set passwd/make-user false
else
db_set passwd/make-user true
fi
elif ! is_system_user; then
db_input medium passwd/make-user || true
fi
......
ubiquity (2.21.63.5) testing; urgency=medium
* Add screen to select if user want to install a school or particular
version.
-- Daniel Bissani Furlin <dbf15@c3sl.ufpr.br> Wed, 13 Sep 2017 11:46:53 -0300
ubiquity (2.21.63.4) testing; urgency=medium
 
* Add educational linux's logo.
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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