Commit Graph

166 Commits

Author SHA1 Message Date
Simo Leone
cd4b603584 Remove dupe code for mounting base image
Also improved variable naming.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-24 20:20:59 -05:00
Simo Leone
adbe44f229 Make _mnt_squashfs more generic
No longer assume the image is in the addons
directory.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-24 20:17:24 -05:00
Simo Leone
9729512abd rc.conf defaults to localtime instead of UTC
Most user's systems will have localtime over UTC,
or at least in a liveCD situation it's a better
assumption.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-24 20:14:41 -05:00
Simo Leone
8a5b9225e9 Fixed addon config parsing
The check for a comment line wasn't actually working
before. Shell quoting ftl.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-24 15:10:42 -05:00
Simo Leone
34e1d6b5dc Make default-config an overlay
This allows the root image to remain a [mostly] pristine
image, and turns default liveCD configurations into an
overlay, rather than copying them into the root image.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-24 02:05:32 -05:00
Simo Leone
0dfc0a36ca Functionalize addon mounting
Moved addon mounting code into functions.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-24 02:05:32 -05:00
Simo Leone
63f9dc1674 Added README with some documentation
Some rudimentary documentation that mkarchiso -h doesn't
quite cover. Poor humor comes free with the deal.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-24 02:05:32 -05:00
Simo Leone
4b62e90475 Make usage message appear before root user check
This allows joe user to see the usage message without
having to specify -h. Trivial.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-24 02:05:32 -05:00
Dan McGee
9a34024e57 Allow livecd to be developer friendly
We should clean up some stuff but not actually muddle with what is installed
by packages. Leave static libs if they were installed, and leave include
files so we can actually build a package from the live CD if we want to.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-24 02:05:32 -05:00
Dan McGee
e1d6dcec6b Fix line in sudoers so we can successfully sudo
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-24 02:05:32 -05:00
Dan McGee
2cde4b9187 Add basic uninstall target to Makefile
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-24 02:05:32 -05:00
Simo Leone
b21ecef676 Updated TODO
Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-16 23:49:30 -05:00
Simo Leone
a0a8c9ef09 Implement fstab-like addon config
For now all it handles is bind mounting and squashfs
images that have to overlay at the root. The config
file syntax is obviously borrowed from fstab. This
is far from final, much of it could use some cleanup.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-16 23:49:30 -05:00
Simo Leone
413b2fd552 Implemented a simple addon mechanism
If asked to do so, mkarchiso simply copies a
directory full of addons to the iso root.

On boot, after union-mounting /real_root, the
archiso hook will look for and source an addon
config file. This file is a plain old bash
script, which makes it quite flexible. The addon
config should be written to take care of any
mounting that needs to be done, an example of
typical tasks is also included.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-16 23:38:05 -05:00
Dan McGee
47d1d2b0f7 Ensure the default config is copied into the ISO with correct perms
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-14 22:12:53 -05:00
Dan McGee
ef89b8a29f Make mkarchiso a bit more KISS
Remove the need for a configuration file. Some of the command line options
had to be switched up a bit in order to do this. Also simplify the package
list- only one package list is needed, not a directory, and additional
packages can be specified on the command line.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-14 22:07:19 -05:00
Dan McGee
2f10bc9b79 Add bin images to repo, and fix up the paths in GRUB
Add some of the bin images we say we have into the GIT repo so that our
ISO actually builds with these files. All latest versions were fetched:

* diag2.img: 19-Feb-2007 (no version number)
* memdisk.bin: built from syslinux-3.52
* memtest86+: 1.70
* x86_test: 0.10a

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-14 11:38:31 -05:00
Dan McGee
9cfc199c95 Update TODO
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-14 11:38:09 -05:00
Dan McGee
e686cf5dcf First attempt at a makefile for the archiso package
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-14 11:37:59 -05:00
Dan McGee
eb3e9b28da Return mkarchiso to being quiet
Add some output redirects again to make the script a bit more silent. Full
verbosity can still be had with the -v option.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-10 23:05:26 -05:00
Dan McGee
e5fb50c573 Fix issue where stock Arch initscripts were unable to find /
If we add a root entry in our default fstab, we will be able to remount
root without issues in the initscripts, even if we don't have access to
the original mount locations and such.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-10 23:05:26 -05:00
Dan McGee
bc8ec134e1 Slight updates to initcpio hooks
* Get rid of unnecessary trailing slash on BOOT_MOUNT variable
* Fix -eq/= mixup- we are comparing strings, not numbers
* Don't unmount /dev, as it was never mounted

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-10 23:05:26 -05:00
Dan McGee
34c7ce7193 Ew, DOS line endings. Get rid of them.
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-10 23:05:26 -05:00
Dan McGee
77fd769e5c Add some groups that were missing from the default config
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-10 23:05:26 -05:00
Simo Leone
5c7046f2fc Can now break out of archiso hook into dash
Usually initcpio's init takes care of this, but
it never executes that far, so this is copypasta.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-10 22:42:50 -05:00
Dan McGee
8ada60b175 Update vim modelines on most files
Move the vim modelines to the bottom, and add the tab settings.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-10 22:34:28 -05:00
Dan McGee
fccb39dcd8 A bunch of those first-glance type updates
Some new eyes on the code, and finding some new things to fix up. A lot of
documentation type stuff with some code commenting. Make the message and
echo stuff a bit more consistant. Move the UID check later so that we can
see help as a normal user. Other small fixups.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-10 21:43:44 -05:00
Dan McGee
695951bb8f Add back to main menu items for two of the submenus
You could get stuck in the keyboard menu with no way out, fix that.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-10 21:43:29 -05:00
Simo Leone
d8ba1b18f7 Updated ARCH kernel modules package list
A bunch of those drivers didn't exist anymore.
Some now ship with the kernel itself.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:27 -05:00
Simo Leone
ffa2a38167 Remove beyond module package list
The beyond kernel no longer exists.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:27 -05:00
Simo Leone
2a7bf8d96e Install default homdir with proper ownership
Now it can be written to. Yay.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:27 -05:00
Simo Leone
9e3ff6cd61 Don't special case 'base' package list
No need to, can be included in any list of
installed packages, base is just a convention.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:27 -05:00
Simo Leone
703d43da17 Made PKGDIR a command line parameter
The package directory is now a command line param.
Also beefed up checking for package file existence.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:27 -05:00
Simo Leone
521c66d892 Update TODO
Added a few items.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:27 -05:00
Simo Leone
3b35c6e759 Don't nuke /tmp on the pristine image
Just nuke /tmp/* instead.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:26 -05:00
Simo Leone
8dea2b65fc Fixed cmdline_param(), used in rc.conf
Turns out /proc gets mounted after rc.conf is sourced for the first time,
so /proc/cmdline isn't such a great place to be getting parameters from
in rc.conf. Use CMDLINE env variable instead, which is set to mostly the
same thing (well the part we care about, at the least).

Also cmdline_param wasn't breaking out of the loop properly.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:26 -05:00
Simo Leone
5fa747b6cb Updated TODO items
Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:26 -05:00
Simo Leone
eee9628b16 Don't use -safe on _pacman() in mkarchiso
This is just something I missed in the mkarchroot patch.
If in doubt, apply.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:26 -05:00
Simo Leone
db2a9699bd Use mkarchroot for package installation
Switch from running pacman directly. This requires root, and thus
fakeroot use has been removed.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:26 -05:00
Simo Leone
0ed7712017 Fixed references to archiso.sqfs
Appears to have been changed to archlive.sqfs,
a couple hooks refered to the old name and didn't work.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:26 -05:00
Simo Leone
c2c8c2a77a Revert "Do not copy sqfs image to RAM"
This reverts commit 42d794561c1f3809f95299e4aa04cd3f28d4239b.
My bad. Bad logic on removing, it was an option anyway.
2007-10-09 20:59:26 -05:00
Simo Leone
93c40cb386 Do not copy sqfs image to RAM
This implies a memory requirement for the running system, since
the sqfs image needs to be able to fit onto the ramdisk, which
breaks lowmem systems like qemu.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:26 -05:00
Simo Leone
69c9986a9c Got archiso into working condition
Several small changes just as a shim to get everything to work.

Signed-off-by: Simo Leone <simo@archlinux.org>
2007-10-09 20:59:26 -05:00
Aaron Griffin
d0688d1130 Added dvorak keyboard layout
git-svn-id: http://phraktured.net/archiso@23 00a9fe69-e71b-0410-bb23-df0e5024db41
2006-11-03 16:34:29 +00:00
Aaron Griffin
6794b191a0 git-svn-id: http://phraktured.net/archiso@22 00a9fe69-e71b-0410-bb23-df0e5024db41 2006-10-04 22:12:16 +00:00
Aaron Griffin
9825506e89 git-svn-id: http://phraktured.net/archiso@21 00a9fe69-e71b-0410-bb23-df0e5024db41 2006-10-03 23:05:11 +00:00
Aaron Griffin
48d53ef270 git-svn-id: http://phraktured.net/archiso@20 00a9fe69-e71b-0410-bb23-df0e5024db41 2006-10-03 22:54:42 +00:00
Aaron Griffin
078a5d06a4 Added keyboard and color selection for grub configuration
git-svn-id: http://phraktured.net/archiso@19 00a9fe69-e71b-0410-bb23-df0e5024db41
2006-10-03 18:45:06 +00:00
Aaron Griffin
04b5d18658 Added a "how to contribute" helpfile
git-svn-id: http://phraktured.net/archiso@18 00a9fe69-e71b-0410-bb23-df0e5024db41
2006-10-03 16:27:21 +00:00
Aaron Griffin
140535c2da rt2x00 currently broken - removed for now
git-svn-id: http://phraktured.net/archiso@17 00a9fe69-e71b-0410-bb23-df0e5024db41
2006-09-29 06:57:28 +00:00