Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
makeiso
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
makeiso
Merge requests
!3
Add nabia release
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Add nabia release
Ark74/makeiso:nabia
into
master
Overview
0
Commits
25
Changes
1
Merged
Luis Guzmán
requested to merge
Ark74/makeiso:nabia
into
master
3 years ago
Overview
0
Commits
25
Changes
1
Expand
0
0
Merge request reports
Viewing commit
670b4ce8
Prev
Next
Show latest version
1 file
+
2
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
670b4ce8
Add $REL variable to track package specific
· 670b4ce8
Luis Guzmán
authored
3 years ago
Remove unused proxy lines
makeiso.sh
+
2
−
3
Options
@@ -129,8 +129,6 @@ export LANGUAGE=C
DO_SOURCE
(){
#use proxy only if proxy variables are set
[
-n
"
$PROXY_ADDRESS
"
]
&&
[
-n
"
$PROXY_PORT
"
]
&&
\
echo
"Acquire::http::Proxy
\"
http://
$PROXY_ADDRESS
:
$PROXY_PORT
/
\"
;"
>
/etc/apt/apt.conf.d/proxy.conf
cat
<<
EOF
> /etc/apt/sources.list
deb
$MIRROR
$CODENAME
main
deb
$MIRROR
$CODENAME
-updates main
@@ -189,7 +187,7 @@ then
echo
"Umounting and removing
$1
"
fuser
-k
$1
||
true
for
MOUNT
in
$1
/proc
$1
/sys
$1
/dev/pts
$1
/tmp
$1
do
do
umount
$MOUNT
||
true
done
rm
-rf
$1
@@ -264,6 +262,7 @@ KERNEL=linux-generic
# package install
echo
"KERNEL=
$KERNEL
"
>
$CHROOT
/tmp/install
echo
"DIST=
$DIST
"
>>
$CHROOT
/tmp/install
echo
"REL=
$REL
"
>>
$CHROOT
/tmp/install
echo
'LANG=C
apt-get update
apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages --no-install-recommends $KERNEL trisquel-minimal trisquel-base
Loading